Changeset 715 for code/branches/FICN/src/orxonox/objects/weapon_system/BulletManager.h

Timestamp:

Dec 28, 2007, 11:33:10 PM (16 years ago)

Author:

rgrieder

Message:

• the master has spoken…
• misc/String.h is not anymore..

File:

• code/branches/FICN/src/orxonox/objects/weapon_system/BulletManager.h (modified) (3 diffs)

code/branches/FICN/src/orxonox/objects/weapon_system/BulletManager.h

@@ -30 +30 @@
 #define _BulletManager_H__
 
+#include <string>
+
 #include <OgrePrerequisites.h>
 
@@ -37 +39 @@
 #include "tinyxml/tinyxml.h"
 //#include "../core/CoreIncludes.h"
-#include "misc/String.h"
 #include "../BaseObject.h"
 #include "../Tickable.h"
@@ -50 +51 @@
     void addBullet(Bullet*);
 
-    int getAmmunitionID(const String&);
+    int getAmmunitionID(const std::string&);
 
     int getNumberOfAmmos();