Changeset 5750 in orxonox.OLD for trunk/src/world_entities/weapons/weapon.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/weapon.cc (modified) (2 diffs)

trunk/src/world_entities/weapons/weapon.cc

@@ -41 +41 @@
  * creates a new weapon
 */
-Weapon::Weapon (WeaponManager* weaponManager)
+Weapon::Weapon ()
 {
   this->init();
-  this->setWeaponManager(weaponManager);
 }
 
@@ -97 +96 @@
   this->energyMax = 10.0;                          //< How much energy can be carried
   this->capability = WTYPE_ALL;                    //< The Weapon has all capabilities @see W_Capability.
-
-  this->setWeaponManager(NULL);                    //< By default the Weapon is free, and unhandled by a WeaponManager (this is good for small enemies).
 }