Changeset 7723 in orxonox.OLD for trunk

Timestamp:

May 19, 2006, 4:28:19 AM (19 years ago)

Author:

bensch

Message:

trunk: Changed away from the Static stuff in GameWorld

Location:

trunk/src/story_entities

Files:

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

trunk/src/story_entities/game_world.cc

@@ -64 +64 @@
 SHELL_COMMAND(speed, GameWorld, setSpeed) ->describe("set the Speed of the Level");
 SHELL_COMMAND(playmode, GameWorld, setPlaymode)
-    ->describe("Set the Playmode of the current Level")
-    ->completionPlugin(0, OrxShell::CompletorStringArray(Playable::playmodeNames, Playable::PlaymodeCount));
-
-SHELL_COMMAND_STATIC(togglePNodeVisibility, GameWorld, GameWorld::togglePNodeVisibility);
-SHELL_COMMAND_STATIC(toggleBVVisibility, GameWorld, GameWorld::toggleBVVisibility);
+->describe("Set the Playmode of the current Level")
+->completionPlugin(0, OrxShell::CompletorStringArray(Playable::playmodeNames, Playable::PlaymodeCount));
+
+SHELL_COMMAND(togglePNodeVisibility, GameWorld, GameWorld::togglePNodeVisibility);
+SHELL_COMMAND(toggleBVVisibility, GameWorld, GameWorld::toggleBVVisibility);
 
 
@@ -477 +477 @@
   /* draw all WorldEntiy groups */
   for (unsigned int i = 0; i < this->dataTank->drawLists.size(); ++i)
-   this->drawEntityList(State::getObjectManager()->getObjectList(this->dataTank->drawLists[i]));
+    this->drawEntityList(State::getObjectManager()->getObjectList(this->dataTank->drawLists[i]));
 
 
@@ -526 +526 @@
 void GameWorld::togglePNodeVisibility()
 {
-  if (State::getCurrentStoryEntity() != NULL &&
-      State::getCurrentStoryEntity()->isA(CL_GAME_WORLD))
-  {
-    dynamic_cast<GameWorld*>(State::getCurrentStoryEntity())->showPNodes = !dynamic_cast<GameWorld*>(State::getCurrentStoryEntity())->showPNodes;
-  }
-  else
-    PRINTF(2)("The Current Story entity is not a GameWorld\n");
+  this->showPNodes = !this->showPNodes;
 };
 
@@ -541 +535 @@
 void GameWorld::toggleBVVisibility()
 {
-  if (State::getCurrentStoryEntity() != NULL &&
-      State::getCurrentStoryEntity()->isA(CL_GAME_WORLD))
-  {
-    dynamic_cast<GameWorld*>(State::getCurrentStoryEntity())->showBV = !dynamic_cast<GameWorld*>(State::getCurrentStoryEntity())->showBV;
-  }
-  else
-    PRINTF(2)("The Current Story entity is not a GameWorld\n");
+  this->showBV = !this->showBV;
 };
 

trunk/src/story_entities/game_world.h

@@ -54 +54 @@
     /**  returns the track path of this world @returns the track path */
 
-    static void togglePNodeVisibility();
-    static void toggleBVVisibility();
+    void togglePNodeVisibility();
+    void toggleBVVisibility();
 
     inline void setSky(WorldEntity* sky) { this->dataTank->sky = sky; }