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

Timestamp:

Jun 22, 2006, 3:14:58 PM (19 years ago)

Author:

bensch

Message:

merged the bsp-model-stuff back here

File:

• trunk/src/story_entities/game_world.cc (modified) (2 diffs)

trunk/src/story_entities/game_world.cc

@@ -305 +305 @@
     this->tick ();
 
+    
+    /* update the state */
+    this->update ();
+
+    
     /* collision detection */
     this->collisionDetection ();
@@ -310 +315 @@
     this->collisionReaction ();
 
+    /* check the game rules */
+    this->checkGameRules();
+    
     /* update the state */
     this->update ();
-
-    /* check the game rules */
-    this->checkGameRules();
     /* draw everything */
     this->display ();