--- a/src/proto2/Physics.hh	Sun Nov 30 15:24:33 2008 +0000
+++ b/src/proto2/Physics.hh	Sun Nov 30 17:13:16 2008 +0000
@@ -8,6 +8,7 @@
 
 #include "Vector.hh"
 #include "Config.hh"
+#include "Terrain.hh"
 
 // Forward declares
 class PhysicsWorld;
@@ -22,13 +23,13 @@
 typedef Vector Force;
 
 // TODO: Random definitions. Should these be somewhere else?
-enum TerrainType {EMPTY, DIRT, ROCK};
+//enum TerrainType {EMPTY, DIRT, ROCK};
 
 // Yeah?!?!?! Atleast this could be documented. Contains vectors
 // presenting all the 8 directions in a square grid?
-const Vector DIRECTIONS[] = { Vector(0,-1), Vector(1,-1), Vector(1,0), 
-                              Vector(1,1), Vector(0,1), Vector(-1,1), 
-                              Vector(-1,0), Vector(-1,-1) };
+//const Vector DIRECTIONS[] = { Vector(0,-1), Vector(1,-1), Vector(1,0), 
+//                            Vector(1,1), Vector(0,1), Vector(-1,1), 
+//                            Vector(-1,0), Vector(-1,-1) };
 
 
 /**
@@ -42,6 +43,8 @@
     CL_Timer tick_timer;
     uint32_t tick_counter;
 
+    Terrain terrain;
+
 protected:
     //std::vector<PlayerObject*> players;
     //std::vector<ProjectileObject*> projectiles;
@@ -56,10 +59,7 @@
     Vector dimensions;
     Vector gravity;
 
-    // TODO: Should this be it's own class?
-    std::vector<std::vector<TerrainType> > terrain;
-    CL_PixelBuffer terr;
-    //    CL_Surface surf;
+
 
 public:
     // TODO: Replace addObject with these?