Changeset 7339 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Apr 19, 2006, 2:11:14 AM (19 years ago)

Author:

bensch

Message:

some nice fixes

Location:

trunk/src/story_entities

Files:

• game_world.cc (modified) (2 diffs)
• game_world.h (modified) (1 diff)

trunk/src/story_entities/game_world.cc

@@ -70 +70 @@
 
 SHELL_COMMAND(speed, GameWorld, setSpeed);
+SHELL_COMMAND(playmode, GameWorld, setPlaymode);
 SHELL_COMMAND_STATIC(togglePNodeVisibility, GameWorld, GameWorld::togglePNodeVisibility);
 SHELL_COMMAND_STATIC(toggleBVVisibility, GameWorld, GameWorld::toggleBVVisibility);
@@ -284 +285 @@
   if (this->dataTank->localPlayer &&
       this->dataTank->localPlayer->getPlayable() &&
-      this->dataTank->localPlayer->getPlayable()->setPlayMode(playmode))
-  {
-    PRINTF(3)("Set Playmode to %d\n", playmode);
-  }
-}
-
+      this->dataTank->localPlayer->getPlayable()->setPlaymode(playmode))
+  {
+    PRINTF(3)("Set Playmode to %d:%s\n", playmode, Playable::playmodeToString(playmode));
+  }
+  else
+  {
+    PRINTF(1)("Unable to set Playmode %d:%s\n", playmode, Playable::playmodeToString(playmode));
+  }
+}
+
+void GameWorld::setPlaymode(const std::string& playmode)
+{
+  this->setPlaymode(Playable::stringToPlaymode(playmode));
+}
 
 /**

trunk/src/story_entities/game_world.h

@@ -47 +47 @@
 
     void setPlaymode(Playable::Playmode playmode);
+    void setPlaymode(const std::string& playmode);
     /**  this returns the current game time @returns elapsed game time     */
     inline double getGameTime() { return this->gameTime; }