diff -r ba0b6f421a3c -r ea2f295c279f src/proto2/Physics.hh
--- a/src/proto2/Physics.hh	Mon Dec 01 17:46:52 2008 +0000
+++ b/src/proto2/Physics.hh	Mon Dec 01 21:49:35 2008 +0000
@@ -26,14 +26,14 @@
  * PhysicsWorld class. PhysicsWorld contains PhysicsObjects that are
  * simulated in the PhysicsWorld.
  */
-class PhysicsWorld {
+class PhysicsWorld : public Terrain {
     friend class PhysicsObject;
 
 private:
     CL_Timer tick_timer;
     uint32_t tick_counter;
 
-    Terrain terrain;
+    //    Terrain terrain;
 
 protected:
     //std::vector<PlayerObject*> players;
@@ -75,51 +75,6 @@
      */
     uint32_t getTick();
 
-    // ?!!?!?!?!?!?!
-    // TODO: If there were a terrain class, these could it's members.
-    /**
-     * Generate random terrain.
-     *
-     * @param seed Random generator seed.
-     */
-    void generateTerrain(int seed);
-    /**
-     * Remove ground from the terrain. Removes a circle.
-     *
-     * @param x Circle x-coordinate
-     * @param y Circle y-coordinate
-     * @param r Circle radius
-     */
-    void removeGround(int x, int y, float r);
-    /**
-     * Remove ground from the terrain. Removes a circle.
-     *
-     * @param pos Circle location
-     * @param r Circle radius
-     */
-    void removeGround(Vector pos, float r);
-    /**
-     * Return normal for the wall that has been hit.
-     *
-     * @param hitPoint The point of the wall that has been hit.
-     * @param prevPoint The point from where we were coming.
-     */
-    Vector getNormal(Vector hitPoint, Vector prevPoint);
-    /**
-     * Return terrain type in given position.
-     *
-     * @param x X-coordinate
-     * @param y Y-coordinate
-     */
-    TerrainType getType(int x, int y) const;
-    /**
-     * Return terrain type in given position.
-     *
-     * @param pos Coordinate vector
-     */
-    TerrainType getType(Vector pos) const;
-
-    void drawTerrain(CL_GraphicContext *gc);
 };
 
 /**