[Orxonox-commit 1596] r6314 - in code/branches/presentation2/src/orxonox: . items weaponsystem

[landauf at orxonox.net]

Author: landauf
Date: 2009-12-10 18:30:13 +0100 (Thu, 10 Dec 2009)
New Revision: 6314

Modified:
   code/branches/presentation2/src/orxonox/Radar.cc
   code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc
   code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc
Log:
fixed some warnings

Modified: code/branches/presentation2/src/orxonox/Radar.cc
===================================================================
--- code/branches/presentation2/src/orxonox/Radar.cc	2009-12-10 07:49:33 UTC (rev 6313)
+++ code/branches/presentation2/src/orxonox/Radar.cc	2009-12-10 17:30:13 UTC (rev 6314)
@@ -46,8 +46,8 @@
 {
 
     Radar::Radar()
-        : focus_(0)
-        , itFocus_(0)
+        : itFocus_(0)
+        , focus_(0)
         , objectTypeCounter_(0)
     {
         // TODO: make this mapping configurable. Maybe there's a possibility with self configured

Modified: code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc
===================================================================
--- code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc	2009-12-10 07:49:33 UTC (rev 6313)
+++ code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc	2009-12-10 17:30:13 UTC (rev 6314)
@@ -34,6 +34,7 @@
 }
 
 #include "util/Convert.h"
+#include "util/StringUtils.h"
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"
 #include "core/LuaState.h"
@@ -250,7 +251,7 @@
             return defEngineSndNormal_->getSource();
         else
             assert(0);
-        return std::string();
+        return BLANKSTRING;
     }
 
     void MultiStateEngine::setDefEngSndBoost(const std::string &engineSound)
@@ -267,6 +268,6 @@
             return defEngineSndBoost_->getSource();
         else
             assert(0);
-        return std::string();
+        return BLANKSTRING;
     }
 }

Modified: code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc
===================================================================
--- code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc	2009-12-10 07:49:33 UTC (rev 6313)
+++ code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc	2009-12-10 17:30:13 UTC (rev 6314)
@@ -29,6 +29,7 @@
 
 #include "WeaponMode.h"
 
+#include "util/StringUtils.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 #include "controllers/Controller.h"
@@ -271,6 +272,6 @@
         if( this->defSndWpnFire_ )
             return this->defSndWpnFire_->getSource();
         else
-            return std::string();
+            return BLANKSTRING;
     }
 }