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

Timestamp:

Feb 5, 2006, 11:26:21 PM (19 years ago)

Author:

patrick

Message:

trunk: game rules loading problems

Location:

trunk/src/story_entities

Files:

• game_world.cc (modified) (3 diffs)
• game_world_data.cc (modified) (1 diff)

trunk/src/story_entities/game_world.cc

@@ -64 +64 @@
 #include "shader.h"
 
+#include "game_rules.h"
 
 using namespace std;
@@ -350 +351 @@
 
     GraphicsEngine::getInstance()->tick(this->dtS);
+
+    if( likely(this->dataTank->gameRule != NULL))
+      this->dataTank->gameRule->tick(this->dtS);
   }
   this->lastFrame = currentFrame;
@@ -437 +441 @@
 
   engine->draw();
+
+  // draw the game ruls
+  if( likely(this->dataTank->gameRule != NULL))
+    this->dataTank->gameRule->draw();
 }
 

trunk/src/story_entities/game_world_data.cc

@@ -83 +83 @@
   this->music = NULL;
   this->objectManager = NULL;
+  this->gameRule = NULL;
 }