Changeset 4885 in orxonox.OLD for orxonox/trunk/src/world_entities/weapons/test_gun.h

Timestamp:

Jul 18, 2005, 3:36:18 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the weaponSystem back to the trunk, because it seems safe
merged with command:
svn merge -r 4847:HEAD branches/weaponSystem/ trunk/
conflict in file src/world-entities/weapons/weapon.h resolved in favor of the weaponSystem

File:

• orxonox/trunk/src/world_entities/weapons/test_gun.h (modified) (2 diffs)

orxonox/trunk/src/world_entities/weapons/test_gun.h

@@ -34 +34 @@
 class TestGun : public Weapon
 {
-  friend class World;
-
   public:
     TestGun (PNode* parent, const Vector& coordinate, const Quaternion& direction, int leftRight);
@@ -47 +45 @@
     virtual void destroy();
 
-    virtual void tick(float time);
     virtual void weaponIdle();
     virtual void draw();