--- a/src/GameState.cc	Tue Jan 20 23:24:04 2009 +0200
+++ b/src/GameState.cc	Tue Jan 20 23:30:18 2009 +0200
@@ -3,8 +3,10 @@
 #include "Engine.hh"
 #include "Config.hh"
 
-GameState::GameState (void) : 
-    world(Vector(0, MAP_GRAVITY), Vector(MAP_WIDTH, MAP_HEIGHT)), local_player(NULL), event_handler(NULL)
+GameState::GameState (Terrain &terrain) : 
+    world(Vector(0, MAP_GRAVITY), Vector(terrain.getWidth(), terrain.getHeight()), terrain), 
+    terrain(terrain),
+    local_player(NULL), event_handler(NULL)
 { 
 
 }
@@ -49,8 +51,8 @@
 }
     
 void GameState::draw(Graphics *g, PixelCoordinate camera, bool displayWeapon) {
-    // Draw world/terrain
-    world.draw(g, camera);
+    // Draw terrain
+    terrain.draw(g, camera);
 
     // Draw players
     for (std::list<Player*>::iterator it = player_list.begin(); it != player_list.end(); it++) {