Changeset 715 for code/branches/FICN/src/orxonox/objects/weapon_system

Timestamp:

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

Author:

rgrieder

Message:

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

Location:

code/branches/FICN/src/orxonox/objects/weapon_system

Files:

• AmmunitionDump.cc (modified) (4 diffs)
• AmmunitionDump.h (modified) (3 diffs)
• BulletManager.cc (modified) (1 diff)
• BulletManager.h (modified) (3 diffs)

code/branches/FICN/src/orxonox/objects/weapon_system/AmmunitionDump.cc

@@ -59 +59 @@
   }
 
-  void AmmunitionDump::setDumpSize(const String &name, int size)
+  void AmmunitionDump::setDumpSize(const std::string &name, int size)
   {
     if (size < 0)
@@ -70 +70 @@
 
 
-  int AmmunitionDump::store(const String &name, int quantity)
+  int AmmunitionDump::store(const std::string &name, int quantity)
   {
     int id = Orxonox::getSingleton()->getBulletMgr()->getAmmunitionID(name);
@@ -87 +87 @@
 
 
-  int AmmunitionDump::getAmmunition(const String &name, int quantity)
+  int AmmunitionDump::getAmmunition(const std::string &name, int quantity)
   {
     int id = Orxonox::getSingleton()->getBulletMgr()->getAmmunitionID(name);
@@ -103 +103 @@
 
 
-  int AmmunitionDump::getStockSize(const String &name)
+  int AmmunitionDump::getStockSize(const std::string &name)
   {
     int id = Orxonox::getSingleton()->getBulletMgr()->getAmmunitionID(name);

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

@@ -30 +30 @@
 #define _AmmunitionDump_H__
 
+#include <string>
+
 #include <OgrePrerequisites.h>
 
@@ -36 +38 @@
 #include "network/Synchronisable.h"
 //#include "../core/CoreIncludes.h"
-#include "misc/String.h"
 #include "../BaseObject.h"
 
@@ -47 +48 @@
           ~AmmunitionDump();
 
-    void setDumpSize(const String &name, int size);
+    void setDumpSize(const std::string &name, int size);
 
-    int store(const String &name, int quantiy);
+    int store(const std::string &name, int quantiy);
 
-    int getAmmunition(const String &name, int quantity);
+    int getAmmunition(const std::string &name, int quantity);
 
-    int getStockSize(const String &name);
+    int getStockSize(const std::string &name);
 
     virtual void loadParams(TiXmlElement* xmlElem) { BaseObject::loadParams(xmlElem); };

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

@@ -82 +82 @@
   }
 
-  int BulletManager::getAmmunitionID(const String &ammoName)
+  int BulletManager::getAmmunitionID(const std::string &ammoName)
   {
-    String ammoTypes[] = { "Energy Cell", "Barrel", "Lead Shot" };
+    std::string ammoTypes[] = { "Energy Cell", "Barrel", "Lead Shot" };
     int ammoTypesLength = 3;
 

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();