Changeset 9705 in orxonox.OLD for branches/new_class_id/src/world_entities/weapons/weapon.h

Timestamp:

Aug 25, 2006, 9:44:53 PM (18 years ago)

Author:

bensch

Message:

adapted many more classes

File:

• branches/new_class_id/src/world_entities/weapons/weapon.h (modified) (2 diffs)

branches/new_class_id/src/world_entities/weapons/weapon.h

@@ -83 +83 @@
 class Weapon : public WorldEntity
 {
+  NewObjectListDeclaration(Weapon);
+
   public:
     // INITIALISATION //
     Weapon ();
     virtual ~Weapon ();
-    static Weapon* createWeapon(NewClassID weaponID);
+    static Weapon* createWeapon(const NewClassID& weaponID);
+    static Weapon* createWeapon(const std::string& weaponName);
 
     void init();
@@ -110 +113 @@
     /** @returns the Capabilities of this Weapon */
     inline long getCapability() const { return this->capability; };
-    void setProjectileType(NewClassID projectile);
+    void setProjectileType(const NewClassID& projectile);
     void setProjectileTypeC(const std::string& projectile);
     /** @returns The projectile's classID */