Changeset 715 for code/branches/FICN/src/orxonox/objects/SpaceShip.cc

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/SpaceShip.cc (modified) (4 diffs)

code/branches/FICN/src/orxonox/objects/SpaceShip.cc

@@ -26 +26 @@
  */
 
+#include <string>
+
 #include <OIS/OIS.h>
 #include <OgreCamera.h>
@@ -34 +36 @@
 #include "tinyxml/tinyxml.h"
 #include "misc/String2Number.h"
-#include "misc/String.h"
 #include "../core/CoreIncludes.h"
 #include "../core/Debug.h"
@@ -196 +197 @@
         if (xmlElem->Attribute("forward") && xmlElem->Attribute("rotateupdown") && xmlElem->Attribute("rotaterightleft") && xmlElem->Attribute("looprightleft"))
         {
-            String forwardStr = xmlElem->Attribute("forward");
-            String rotateupdownStr = xmlElem->Attribute("rotateupdown");
-            String rotaterightleftStr = xmlElem->Attribute("rotaterightleft");
-            String looprightleftStr = xmlElem->Attribute("looprightleft");
+            std::string forwardStr = xmlElem->Attribute("forward");
+            std::string rotateupdownStr = xmlElem->Attribute("rotateupdown");
+            std::string rotaterightleftStr = xmlElem->Attribute("rotaterightleft");
+            std::string looprightleftStr = xmlElem->Attribute("looprightleft");
 
             String2Number<float>(this->maxSpeedForward_, forwardStr);
@@ -212 +213 @@
         {
 
-            String msStr = xmlElem->Attribute("maxSpeed");
-            String msabsStr = xmlElem->Attribute("maxSideAndBackSpeed");
-            String mrStr = xmlElem->Attribute("maxRotation");
-            String taStr = xmlElem->Attribute("transAcc");
-            String raStr = xmlElem->Attribute("rotAcc");
-            String tdStr = xmlElem->Attribute("transDamp");
-            String rdStr = xmlElem->Attribute("rotDamp");
+            std::string msStr = xmlElem->Attribute("maxSpeed");
+            std::string msabsStr = xmlElem->Attribute("maxSideAndBackSpeed");
+            std::string mrStr = xmlElem->Attribute("maxRotation");
+            std::string taStr = xmlElem->Attribute("transAcc");
+            std::string raStr = xmlElem->Attribute("rotAcc");
+            std::string tdStr = xmlElem->Attribute("transDamp");
+            std::string rdStr = xmlElem->Attribute("rotDamp");
 
             String2Number<float>(this->maxSpeed_, msStr);