Changeset 8697 in orxonox.OLD for branches/terrain/src/story_entities/game_world.cc

Timestamp:

Jun 21, 2006, 11:45:20 PM (19 years ago)

Author:

patrick

Message:

merged the terrain with the new trunk (MARK TERRAIN)

Location:

branches/terrain

Files:

• . (copied) (copied from trunk)
• src/story_entities/game_world.cc (modified) (1 diff)

branches/terrain/src/story_entities/game_world.cc

@@ -30 +30 @@
 #include "camera.h"
 #include "environment.h"
-#include "terrain.h"
 #include "test_entity.h"
-#include "terrain.h"
+#include "terrain_entity.h"
 #include "playable.h"
 #include "environments/mapped_water.h"