Changeset 5750 in orxonox.OLD for trunk/src/world_entities/weapons/test_gun.cc

Timestamp:

Nov 24, 2005, 12:13:22 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the WorldEntities into the Trunk.
Merged with command:
svn merge branches/world_entities/ trunk/ -r5516:HEAD

conflics from world_entities changed in favor of branches/world_entity
all other conflict in favor of the trunk

File:

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

trunk/src/world_entities/weapons/test_gun.cc

@@ -41 +41 @@
 using namespace std;
 
-CREATE_FACTORY(TestGun);
+CREATE_FACTORY(TestGun, CL_TEST_GUN);
 
 /**
@@ -48 +48 @@
    creates a new weapon
 */
-TestGun::TestGun (WeaponManager* weaponManager, int leftRight)
-  : Weapon(weaponManager)
+TestGun::TestGun ( int leftRight)
+  : Weapon()
 {
   this->init();