Changeset 4972 in orxonox.OLD for orxonox/trunk/src/world_entities/weapons/weapon.h

Timestamp:

Aug 7, 2005, 10:32:23 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: many loadParams

File:

• orxonox/trunk/src/world_entities/weapons/weapon.h (modified) (4 diffs)

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

@@ -77 +77 @@
     // INITIALISATION //
     Weapon (WeaponManager* weaponManager = NULL);
-    Weapon(const TiXmlElement* root);
     virtual ~Weapon ();
 
@@ -89 +88 @@
     ///////////////////
 
-    /** @param weaponManager sets the WeaponManager for this Weapon (NULL if free))*/
+    /** @param weaponManager sets the WeaponManager for this Weapon (NULL if free)) */
     inline void setWeaponManager(WeaponManager* weaponManager) { this->weaponManager = weaponManager; };
     /** @returns the WeaponManager of this Weapon (or NULL if it is free) */
@@ -102 +101 @@
 
     // FUNCTIONS TO SET THE WEAPONS PROPERTIES.
-    bool setProjectile(ClassID projectile);
-    bool setProjectile(const char* projectile);
+    void setProjectile(ClassID projectile);
+    void setProjectile(const char* projectile);
     /** @returns The projectile's classID */
     inline ClassID getProjectile() { return this->projectile; };
@@ -112 +111 @@
     void setEmissionPoint(const Vector& point);
     /** @see void setEmissionPoint(const Vector& point); */
-    inline void setEmissionPoint(float x, float y, float z) { this->setEmissionPoint(Vector(x,y,z)); };
+    inline void setEmissionPoint(float x, float y, float z) { this->setEmissionPoint(Vector(x, y, z)); };
     /** @returns the absolute Position of the EmissionPoint */
     inline const Vector& getEmissionPoint() const { return this->emissionPoint.getAbsCoor(); };