[Orxonox-commit 1123] r5844 - in code/branches/core5/src: . libraries/core orxonox/infos

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-09-30 20:47:40 +0200 (Wed, 30 Sep 2009)
New Revision: 5844

Modified:
   code/branches/core5/src/Orxonox.cc
   code/branches/core5/src/libraries/core/CommandLine.cc
   code/branches/core5/src/libraries/core/Game.cc
   code/branches/core5/src/orxonox/infos/PlayerInfo.cc
   code/branches/core5/src/orxonox/infos/PlayerInfo.h
Log:
Fixed some small problems.

Modified: code/branches/core5/src/Orxonox.cc
===================================================================
--- code/branches/core5/src/Orxonox.cc	2009-09-30 18:42:45 UTC (rev 5843)
+++ code/branches/core5/src/Orxonox.cc	2009-09-30 18:47:40 UTC (rev 5844)
@@ -62,9 +62,9 @@
         std::string strCmdLine;
         for (int i = 1; i < argc; ++i)
             strCmdLine += argv[i] + std::string(" ");
+#endif
 
         return orxonox::main(strCmdLine);
-#endif
     }
     catch (...)
     {

Modified: code/branches/core5/src/libraries/core/CommandLine.cc
===================================================================
--- code/branches/core5/src/libraries/core/CommandLine.cc	2009-09-30 18:42:45 UTC (rev 5843)
+++ code/branches/core5/src/libraries/core/CommandLine.cc	2009-09-30 18:47:40 UTC (rev 5844)
@@ -283,6 +283,7 @@
             maxNameSize = std::max(it->second->getName().size(), maxNameSize);
         }
 
+        infoStr << std::endl;
         infoStr << "Usage: orxonox [options]" << std::endl;
         infoStr << "Available options:" << std::endl;
 

Modified: code/branches/core5/src/libraries/core/Game.cc
===================================================================
--- code/branches/core5/src/libraries/core/Game.cc	2009-09-30 18:42:45 UTC (rev 5843)
+++ code/branches/core5/src/libraries/core/Game.cc	2009-09-30 18:47:40 UTC (rev 5844)
@@ -409,6 +409,8 @@
                 currentNode = currentNode->parent_.lock();
                 requestedNodes.push_back(currentNode);
             }
+            if (currentNode == NULL)
+                requestedNodes.clear();
         }
 
         if (requestedNodes.empty())

Modified: code/branches/core5/src/orxonox/infos/PlayerInfo.cc
===================================================================
--- code/branches/core5/src/orxonox/infos/PlayerInfo.cc	2009-09-30 18:42:45 UTC (rev 5843)
+++ code/branches/core5/src/orxonox/infos/PlayerInfo.cc	2009-09-30 18:47:40 UTC (rev 5844)
@@ -34,6 +34,7 @@
 #include "network/ClientInformation.h"
 #include "gametypes/Gametype.h"
 #include "worldentities/ControllableEntity.h"
+#include "controllers/Controller.h"
 
 namespace orxonox
 {

Modified: code/branches/core5/src/orxonox/infos/PlayerInfo.h
===================================================================
--- code/branches/core5/src/orxonox/infos/PlayerInfo.h	2009-09-30 18:42:45 UTC (rev 5843)
+++ code/branches/core5/src/orxonox/infos/PlayerInfo.h	2009-09-30 18:47:40 UTC (rev 5844)
@@ -33,7 +33,6 @@
 
 #include "Info.h"
 #include "core/SubclassIdentifier.h"
-#include "controllers/Controller.h"
 
 namespace orxonox
 {