Changeset 5844

Timestamp:

Sep 30, 2009, 8:47:40 PM (15 years ago)

Author:

rgrieder

Message:

Fixed some small problems.

Location:

code/branches/core5/src

Files:

• Orxonox.cc (modified) (1 diff)
• libraries/core/CommandLine.cc (modified) (1 diff)
• libraries/core/Game.cc (modified) (1 diff)
• orxonox/infos/PlayerInfo.cc (modified) (1 diff)
• orxonox/infos/PlayerInfo.h (modified) (1 diff)

code/branches/core5/src/Orxonox.cc

@@ -63 +63 @@
         for (int i = 1; i < argc; ++i)
             strCmdLine += argv[i] + std::string(" ");
+#endif
 
         return orxonox::main(strCmdLine);
-#endif
     }
     catch (...)

code/branches/core5/src/libraries/core/CommandLine.cc

@@ -284 +284 @@
         }
 
+        infoStr << std::endl;
         infoStr << "Usage: orxonox [options]" << std::endl;
         infoStr << "Available options:" << std::endl;

code/branches/core5/src/libraries/core/Game.cc

@@ -410 +410 @@
                 requestedNodes.push_back(currentNode);
             }
+            if (currentNode == NULL)
+                requestedNodes.clear();
         }
 

code/branches/core5/src/orxonox/infos/PlayerInfo.cc

@@ -35 +35 @@
 #include "gametypes/Gametype.h"
 #include "worldentities/ControllableEntity.h"
+#include "controllers/Controller.h"
 
 namespace orxonox

code/branches/core5/src/orxonox/infos/PlayerInfo.h

@@ -34 +34 @@
 #include "Info.h"
 #include "core/SubclassIdentifier.h"
-#include "controllers/Controller.h"
 
 namespace orxonox