Changeset 8190 in orxonox.OLD for trunk/src/story_entities/game_world.h

Timestamp:

Jun 7, 2006, 3:00:01 PM (19 years ago)

Author:

patrick

Message:

trunk: merged the cr branche to trunk

File:

• trunk/src/story_entities/game_world.h (modified) (1 diff)

trunk/src/story_entities/game_world.h

@@ -68 +68 @@
     virtual void update();
     virtual void checkGameRules();
-    virtual void collide();
+    virtual void collisionDetection();
+    virtual void collisionReaction();
 
     void drawEntityList(const ObjectManager::EntityList& drawList ) const;