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

Timestamp:

Mar 15, 2006, 3:10:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

File:

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

trunk/src/world_entities/weapons/weapon.h

@@ -111 +111 @@
     inline long getCapability() const { return this->capability; };
     void setProjectileType(ClassID projectile);
-    void setProjectileTypeC(const char* projectile);
+    void setProjectileTypeC(const std::string& projectile);
     /** @returns The projectile's classID */
     inline ClassID getProjectileType() { return this->projectile; };
@@ -132 +132 @@
     // STATE CHANGES //
     /** @param state the State to time @param duration the duration of the State */
-    inline void setStateDuration(const char* state, float duration) { setStateDuration(charToState(state), duration); };
+    inline void setStateDuration(const std::string& state, float duration) { setStateDuration(charToState(state), duration); };
     /** @param state the State to time @param duration the duration of the State */
     inline void setStateDuration(WeaponState state, float duration) { /*(state < WS_STATE_COUNT)?*/this->times[state] = duration; };
@@ -148 +148 @@
     inline void setAmmoContainer(const CountPointer<AmmoContainer>& ammoContainer) { this->ammoContainer = ammoContainer;}
 
-    void setActionSound(WeaponAction action, const char* soundFile);
-    /** @see void setActionSound(WeaponAction action, const char* soundFile); */
-    void setActionSound(const char* action, const char* soundFile) { this->setActionSound(charToAction(action), soundFile); };
+    void setActionSound(WeaponAction action, const std::string& soundFile);
+    /** @see void setActionSound(WeaponAction action, const std::string& soundFile); */
+    void setActionSound(const std::string& action, const std::string& soundFile) { this->setActionSound(charToAction(action), soundFile); };
 
     Animation3D* getAnimation(WeaponState state, PNode* node = NULL);
@@ -176 +176 @@
 
     // utility:
-    static WeaponAction  charToAction(const char* action);
+    static WeaponAction  charToAction(const std::string& action);
     static const char*   actionToChar(WeaponAction action);
-    static WeaponState   charToState(const char* state);
+    static WeaponState   charToState(const std::string& state);
     static const char*   stateToChar(WeaponState state);