Changeset 2173 for code/branches/objecthierarchy2/src/orxonox

Timestamp:

Nov 10, 2008, 2:06:09 AM (16 years ago)

Author:

landauf

Message:

• Added new XMLPort mode, ExpandObject, which works like LoadObject but doesn't use default values if there are missing parameters. This is used if an object is expanded by templates (like adding CameraPositions).
• Changed default level to sample3.oxw in objecthierarchy2 branch
• Small fix with doubly added clients in Level- and PlayerManager

Location:

code/branches/objecthierarchy2/src/orxonox

Files:

• LevelManager.cc (modified) (1 diff)
• gamestates/GSLevel.cc (modified) (1 diff)
• objects/Level.cc (modified) (2 diffs)

code/branches/objecthierarchy2/src/orxonox/LevelManager.cc

@@ -42 +42 @@
         assert(singletonRef_s == 0);
         singletonRef_s = this;
+
+        PlayerManager::getInstance(); // ensure existence of PlayerManager
     }
 

code/branches/objecthierarchy2/src/orxonox/gamestates/GSLevel.cc

@@ -51 +51 @@
 namespace orxonox
 {
-    SetCommandLineArgument(level, "sample2.oxw").shortcut("l");
+    SetCommandLineArgument(level, "sample3.oxw").shortcut("l");
 
     GSLevel::GSLevel()

code/branches/objecthierarchy2/src/orxonox/objects/Level.cc

@@ -141 +141 @@
     void Level::playerEntered(PlayerInfo* player)
     {
-        COUT(3) << "player entered level" << std::endl;
+        COUT(3) << "player entered level (id: " << player->getClientID() << ", name: " << player->getName() << ")" << std::endl;
         player->setGametype(this->getGametype());
     }
@@ -147 +147 @@
     void Level::playerLeft(PlayerInfo* player)
     {
-        COUT(3) << "player left level" << std::endl;
+        COUT(3) << "player left level (id: " << player->getClientID() << ", name: " << player->getName() << ")" << std::endl;
         player->setGametype(0);
     }