[Pingus-CVS] r2674 - in branches/pingus_sdl/src: . actions

[grumbel at BerliOS]

Author: grumbel
Date: 2007-01-17 11:15:39 +0100 (Wed, 17 Jan 2007)
New Revision: 2674

Added:
   branches/pingus_sdl/src/collision_mask.cpp
   branches/pingus_sdl/src/collision_mask.hpp
Modified:
   branches/pingus_sdl/src/SConscript
   branches/pingus_sdl/src/actions/basher.cxx
   branches/pingus_sdl/src/actions/basher.hxx
   branches/pingus_sdl/src/actions/bomber.cxx
   branches/pingus_sdl/src/actions/bomber.hxx
   branches/pingus_sdl/src/actions/bridger.cxx
   branches/pingus_sdl/src/actions/bridger.hxx
   branches/pingus_sdl/src/actions/digger.cxx
   branches/pingus_sdl/src/actions/digger.hxx
   branches/pingus_sdl/src/actions/miner.cxx
   branches/pingus_sdl/src/actions/miner.hxx
   branches/pingus_sdl/src/pingu_action.hxx
   branches/pingus_sdl/src/resource.cxx
   branches/pingus_sdl/src/resource.hxx
   branches/pingus_sdl/src/world.cxx
   branches/pingus_sdl/src/world.hxx
Log:
- replaced a bunch of PixelBuffer with CollisionMask

Modified: branches/pingus_sdl/src/SConscript
===================================================================
--- branches/pingus_sdl/src/SConscript  2007-01-17 09:29:29 UTC (rev 2673)
+++ branches/pingus_sdl/src/SConscript  2007-01-17 10:15:39 UTC (rev 2674)
@@ -131,6 +131,7 @@
 'command_line_generic.cpp',
 
 'pixel_buffer.cpp',
+'collision_mask.cpp',
 
 'exit_menu.cxx', 
 'file_dialog.cxx', 

Modified: branches/pingus_sdl/src/actions/basher.cxx
===================================================================
--- branches/pingus_sdl/src/actions/basher.cxx  2007-01-17 09:29:29 UTC (rev 
2673)
+++ branches/pingus_sdl/src/actions/basher.cxx  2007-01-17 10:15:39 UTC (rev 
2674)
@@ -32,8 +32,7 @@
 
 Basher::Basher (Pingu* p)
   : PinguAction(p),
-    bash_radius(Resource::load_pixelbuffer("other/bash_radius")),
-    bash_radius_gfx(Resource::load_pixelbuffer("other/bash_radius_gfx")),
+    bash_radius(Resource::load_collision_mask("other/bash_radius")),
     basher_c(0),
     first_bash(true)
 {
@@ -42,9 +41,8 @@
   sprite.load(Direction::RIGHT, Resource::load_sprite("pingus/player" + 
     pingu->get_owner_str() + "/basher/right"));
 
-  bash_radius_width     = bash_radius.get_width();
-  bash_radius_gfx_width = bash_radius_gfx.get_width();
-
+  bash_radius_width = bash_radius.get_width();
+  
   // The +1 is just in case bash_radius is an odd no.  In which case, want to
   // round up the result.
   bash_reach = static_cast<int>(bash_radius_width + 1) / 2;
@@ -108,12 +106,9 @@
 void
 Basher::bash()
 {
-  WorldObj::get_world()->get_colmap()->remove(bash_radius,
-                                             static_cast<int>(pingu->get_x () 
- (bash_radius_width / 2)),
-                                             static_cast<int>(pingu->get_y () 
- bash_radius_width + 1));
-  WorldObj::get_world()->get_gfx_map()->remove(bash_radius_gfx,
-                                              static_cast<int>(pingu->get_x () 
- (bash_radius_gfx_width / 2)),
-                                              static_cast<int>(pingu->get_y () 
- bash_radius_gfx_width + 1));
+  WorldObj::get_world()->remove(bash_radius,
+                                static_cast<int>(pingu->get_x () - 
(bash_radius_width / 2)),
+                                static_cast<int>(pingu->get_y () - 
bash_radius_width + 1));
 }
 
 void

Modified: branches/pingus_sdl/src/actions/basher.hxx
===================================================================
--- branches/pingus_sdl/src/actions/basher.hxx  2007-01-17 09:29:29 UTC (rev 
2673)
+++ branches/pingus_sdl/src/actions/basher.hxx  2007-01-17 10:15:39 UTC (rev 
2674)
@@ -28,18 +28,14 @@
 class Basher : public PinguAction
 {
 private:
-  StateSprite sprite;
-  PixelBuffer bash_radius;
-  PixelBuffer bash_radius_gfx;
-  int basher_c;
+  StateSprite   sprite;
+  CollisionMask bash_radius;
+  int  basher_c;
   bool first_bash;
 
   /** Width of the bash_radius surface */
   unsigned int bash_radius_width;
 
-  /** Width of the bash_radius_gfx surface */
-  unsigned int bash_radius_gfx_width;
-
   /** The no. of pixels ahead that a Basher checks for something bashable.
       This is initialised using the size of the bash_radius surface. */
   int bash_reach;

Modified: branches/pingus_sdl/src/actions/bomber.cxx
===================================================================
--- branches/pingus_sdl/src/actions/bomber.cxx  2007-01-17 09:29:29 UTC (rev 
2673)
+++ branches/pingus_sdl/src/actions/bomber.cxx  2007-01-17 10:15:39 UTC (rev 
2674)
@@ -34,10 +34,6 @@
 
 namespace Actions {
 
-bool Bomber::static_surface_loaded = false;
-PixelBuffer Bomber::bomber_radius;
-PixelBuffer Bomber::bomber_radius_gfx;
-
 Bomber::Bomber (Pingu* p)
   : PinguAction(p),
     particle_thrown(false),
@@ -49,13 +45,7 @@
   sprite.load(Direction::LEFT,  "pingus/player" + pingu->get_owner_str() + 
"/bomber/left");
   sprite.load(Direction::RIGHT, "pingus/player" + pingu->get_owner_str() + 
"/bomber/right");
 
-  // Only load the surface again if no static_surface is available
-  if (!static_surface_loaded)
-    {
-      static_surface_loaded = true;
-      bomber_radius     = Resource::load_pixelbuffer("other/bomber_radius");
-      bomber_radius_gfx = 
Resource::load_pixelbuffer("other/bomber_radius_gfx");
-    }
+  bomber_radius = Resource::load_collision_mask("other/bomber_radius");
 }
 
 void
@@ -123,12 +113,9 @@
   if (sprite[pingu->direction].get_current_frame () >= 13 && !colmap_exploded)
     {
       colmap_exploded = true;
-      WorldObj::get_world()->get_colmap()->remove(bomber_radius,
+      WorldObj::get_world()->remove(bomber_radius,
                                                   
static_cast<int>(pingu->get_x () - (bomber_radius.get_width()/2)),
                                                   
static_cast<int>(pingu->get_y () - 16 - (bomber_radius.get_width()/2)));
-      WorldObj::get_world()->get_gfx_map()->remove(bomber_radius_gfx,
-                                                   
static_cast<int>(pingu->get_x () - (bomber_radius.get_width()/2)),
-                                                   
static_cast<int>(pingu->get_y () - 16 - (bomber_radius.get_width()/2)));
     }
 
   // The pingu explode

Modified: branches/pingus_sdl/src/actions/bomber.hxx
===================================================================
--- branches/pingus_sdl/src/actions/bomber.hxx  2007-01-17 09:29:29 UTC (rev 
2673)
+++ branches/pingus_sdl/src/actions/bomber.hxx  2007-01-17 10:15:39 UTC (rev 
2674)
@@ -35,10 +35,7 @@
   bool gfx_exploded;
   bool colmap_exploded;
 
-  static bool static_surface_loaded;
-  static PixelBuffer bomber_radius;
-  static PixelBuffer bomber_radius_gfx;
-
+  CollisionMask bomber_radius;
   StateSprite sprite;
 
   Sprite   explo_surf;

Modified: branches/pingus_sdl/src/actions/bridger.cxx
===================================================================
--- branches/pingus_sdl/src/actions/bridger.cxx 2007-01-17 09:29:29 UTC (rev 
2673)
+++ branches/pingus_sdl/src/actions/bridger.cxx 2007-01-17 10:15:39 UTC (rev 
2674)
@@ -48,8 +48,8 @@
   build_sprite.load (Direction::RIGHT, Resource::load_sprite("pingus/player" + 
                                                              
pingu->get_owner_str() + "/bridger/right"));
 
-  brick_l = Resource::load_pixelbuffer("other/brick_left");
-  brick_r = Resource::load_pixelbuffer("other/brick_right");
+  brick_l = Resource::load_collision_mask("other/brick_left");
+  brick_r = Resource::load_collision_mask("other/brick_right");
 }
 
 void
@@ -220,23 +220,17 @@
 
   if (pingu->direction.is_right())
     {
-      WorldObj::get_world()->get_colmap()->put(brick_r,
-                                              
static_cast<int>(pingu->get_pos().x + 10 - brick_r.get_width()),
-                                              
static_cast<int>(pingu->get_pos().y),
-                                              Groundtype::GP_BRIDGE);
-      WorldObj::get_world()->get_gfx_map()->put(brick_r,
-                                               
static_cast<int>(pingu->get_pos().x + 10 - brick_r.get_width()),
-                                               
static_cast<int>(pingu->get_pos().y));
+      WorldObj::get_world()->put(brick_r,
+                                 static_cast<int>(pingu->get_pos().x + 10 - 
brick_r.get_width()),
+                                 static_cast<int>(pingu->get_pos().y),
+                                 Groundtype::GP_BRIDGE);
     }
   else
     {
-      WorldObj::get_world()->get_colmap()->put(brick_r,
+      WorldObj::get_world()->put(brick_r,
                                               
static_cast<int>(pingu->get_pos().x - 10),
                                               
static_cast<int>(pingu->get_pos().y),
                                               Groundtype::GP_BRIDGE);
-      WorldObj::get_world()->get_gfx_map()->put(brick_l,
-                                               
static_cast<int>(pingu->get_pos().x - 10),
-                                               
static_cast<int>(pingu->get_pos().y));
     }
 }
 

Modified: branches/pingus_sdl/src/actions/bridger.hxx
===================================================================
--- branches/pingus_sdl/src/actions/bridger.hxx 2007-01-17 09:29:29 UTC (rev 
2673)
+++ branches/pingus_sdl/src/actions/bridger.hxx 2007-01-17 10:15:39 UTC (rev 
2674)
@@ -36,8 +36,8 @@
 private:
   StateSprite walk_sprite;
   StateSprite build_sprite;
-  PixelBuffer brick_l;
-  PixelBuffer brick_r;
+  CollisionMask brick_l;
+  CollisionMask brick_r;
 
   int bricks;
   //int step;

Modified: branches/pingus_sdl/src/actions/digger.cxx
===================================================================
--- branches/pingus_sdl/src/actions/digger.cxx  2007-01-17 09:29:29 UTC (rev 
2673)
+++ branches/pingus_sdl/src/actions/digger.cxx  2007-01-17 10:15:39 UTC (rev 
2674)
@@ -32,8 +32,8 @@
 
 Digger::Digger (Pingu* p)
   : PinguAction(p),
-    digger_radius(Resource::load_pixelbuffer("other/digger_radius")),
-    digger_radius_gfx(Resource::load_pixelbuffer("other/digger_radius")),
+    digger_radius(Resource::load_collision_mask("other/digger_radius")),
+    digger_radius_gfx(Resource::load_collision_mask("other/digger_radius")),
     digger_c(0)
 {
   digger_radius_width  = digger_radius.get_width();
@@ -92,12 +92,9 @@
 void
 Digger::dig ()
 {
-  WorldObj::get_world()->get_colmap()->remove(digger_radius,
-                                             
static_cast<int>(pingu->get_pos().x - (digger_radius_width / 2)),
-                                             
static_cast<int>(pingu->get_pos().y - digger_radius_height + 2));
-  WorldObj::get_world()->get_gfx_map()->remove(digger_radius_gfx,
-                                              
static_cast<int>(pingu->get_pos().x - (digger_radius_gfx_width / 2)),
-                                              
static_cast<int>(pingu->get_pos().y - digger_radius_gfx_height + 2));
+  WorldObj::get_world()->remove(digger_radius,
+                                static_cast<int>(pingu->get_pos().x - 
(digger_radius_width / 2)),
+                                static_cast<int>(pingu->get_pos().y - 
digger_radius_height + 2));
   pingu->set_pos(pingu->get_pos().x, pingu->get_pos().y + 1.0f);
 }
 

Modified: branches/pingus_sdl/src/actions/digger.hxx
===================================================================
--- branches/pingus_sdl/src/actions/digger.hxx  2007-01-17 09:29:29 UTC (rev 
2673)
+++ branches/pingus_sdl/src/actions/digger.hxx  2007-01-17 10:15:39 UTC (rev 
2674)
@@ -27,8 +27,8 @@
 class Digger : public PinguAction
 {
 private:
-  PixelBuffer digger_radius;
-  PixelBuffer digger_radius_gfx;
+  CollisionMask digger_radius;
+  CollisionMask digger_radius_gfx;
   Sprite sprite;
   int digger_c;
 

Modified: branches/pingus_sdl/src/actions/miner.cxx
===================================================================
--- branches/pingus_sdl/src/actions/miner.cxx   2007-01-17 09:29:29 UTC (rev 
2673)
+++ branches/pingus_sdl/src/actions/miner.cxx   2007-01-17 10:15:39 UTC (rev 
2674)
@@ -31,8 +31,8 @@
 
 Miner::Miner (Pingu* p)
   : PinguAction(p),
-    miner_radius(Resource::load_pixelbuffer("other/bash_radius")),
-    miner_radius_gfx(Resource::load_pixelbuffer("other/bash_radius_gfx")),
+    miner_radius(Resource::load_collision_mask("other/bash_radius")),
+    miner_radius_gfx(Resource::load_collision_mask("other/bash_radius_gfx")),
     slow_count(0)
 {
   sprite.load(Direction::LEFT,  Resource::load_sprite("pingus/player" + 
@@ -54,12 +54,9 @@
     {
       if (!(slow_count % 3))
        {
-         WorldObj::get_world()->get_colmap()->remove(miner_radius,
-                                                     
static_cast<int>(pingu->get_x() - (miner_radius_width / 2) + pingu->direction),
-                                                     
static_cast<int>(pingu->get_y() - miner_radius_width + 1) );
-         WorldObj::get_world()->get_gfx_map()->remove(miner_radius_gfx,
-                                                      
static_cast<int>(pingu->get_x() - (miner_radius_gfx_width / 2) + 
pingu->direction),
-                                                      
static_cast<int>(pingu->get_y() - miner_radius_gfx_width + 1) );
+         WorldObj::get_world()->remove(miner_radius,
+                                        static_cast<int>(pingu->get_x() - 
(miner_radius_width / 2) + pingu->direction),
+                                        static_cast<int>(pingu->get_y() - 
miner_radius_width + 1));
        }
 
       pingu->set_pos(pingu->get_x() + pingu->direction, pingu->get_y() + 1);
@@ -67,12 +64,9 @@
 
   if (rel_getpixel(0, -1) == Groundtype::GP_NOTHING)
     {
-      WorldObj::get_world()->get_colmap()->remove(miner_radius,
-                                                 
static_cast<int>(pingu->get_x() - (miner_radius_width / 2) + pingu->direction),
-                                                 
static_cast<int>(pingu->get_y() - miner_radius_width + 3) );
-      WorldObj::get_world()->get_gfx_map()->remove(miner_radius_gfx,
-                                                  
static_cast<int>(pingu->get_x() - (miner_radius_width / 2) + pingu->direction),
-                                                  
static_cast<int>(pingu->get_y() - miner_radius_width + 3) );
+      WorldObj::get_world()->remove(miner_radius,
+                                    static_cast<int>(pingu->get_x() - 
(miner_radius_width / 2) + pingu->direction),
+                                    static_cast<int>(pingu->get_y() - 
miner_radius_width + 3) );
       pingu->set_action(Actions::Walker);
     }
   else if (rel_getpixel(0, -1) == Groundtype::GP_SOLID
@@ -81,12 +75,9 @@
       if (rel_getpixel(0, -1) == Groundtype::GP_SOLID)
        Sound::PingusSound::play_sound("chink");
 
-      WorldObj::get_world()->get_colmap ()->remove(miner_radius,
-                                                  
static_cast<int>(pingu->get_x() - (miner_radius_width / 2) + pingu->direction),
-                                                  
static_cast<int>(pingu->get_y() - miner_radius_width + 1) );
-      WorldObj::get_world()->get_gfx_map()->remove(miner_radius_gfx,
-                                                  
static_cast<int>(pingu->get_x() - (miner_radius_gfx_width / 2) + 
pingu->direction),
-                                                  
static_cast<int>(pingu->get_y() - miner_radius_gfx_width + 1));
+      WorldObj::get_world()->remove(miner_radius,
+                                    static_cast<int>(pingu->get_x() - 
(miner_radius_width / 2) + pingu->direction),
+                                    static_cast<int>(pingu->get_y() - 
miner_radius_width + 1) );
       pingu->set_action(Actions::Walker);
 
       // Stop Pingu walking further into the solid.

Modified: branches/pingus_sdl/src/actions/miner.hxx
===================================================================
--- branches/pingus_sdl/src/actions/miner.hxx   2007-01-17 09:29:29 UTC (rev 
2673)
+++ branches/pingus_sdl/src/actions/miner.hxx   2007-01-17 10:15:39 UTC (rev 
2674)
@@ -28,8 +28,8 @@
 class Miner : public PinguAction
 {
 private:
-  PixelBuffer miner_radius;
-  PixelBuffer miner_radius_gfx;
+  CollisionMask miner_radius;
+  CollisionMask miner_radius_gfx;
   StateSprite sprite;
   int slow_count;
 

Added: branches/pingus_sdl/src/collision_mask.cpp
===================================================================
--- branches/pingus_sdl/src/collision_mask.cpp  2007-01-17 09:29:29 UTC (rev 
2673)
+++ branches/pingus_sdl/src/collision_mask.cpp  2007-01-17 10:15:39 UTC (rev 
2674)
@@ -0,0 +1,49 @@
+/*  $Id$
+**   __      __ __             ___        __   __ __   __
+**  /  \    /  \__| ____    __| _/_______/  |_|__|  | |  |   ____
+**  \   \/\/   /  |/    \  / __ |/  ___/\   __\  |  | |  | _/ __ \
+**   \        /|  |   |  \/ /_/ |\___ \  |  | |  |  |_|  |_\  ___/
+**    \__/\  / |__|___|  /\____ /____  > |__| |__|____/____/\___  >
+**         \/          \/      \/    \/                         \/
+**  Copyright (C) 2005 Ingo Ruhnke <address@hidden>
+**
+**  This program is free software; you can redistribute it and/or
+**  modify it under the terms of the GNU General Public License
+**  as published by the Free Software Foundation; either version 2
+**  of the License, or (at your option) any later version.
+**
+**  This program is distributed in the hope that it will be useful,
+**  but WITHOUT ANY WARRANTY; without even the implied warranty of
+**  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**  GNU General Public License for more details.
+** 
+**  You should have received a copy of the GNU General Public License
+**  along with this program; if not, write to the Free Software
+**  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+**  02111-1307, USA.
+*/
+
+#include "collision_mask.hpp"
+
+CollisionMask::CollisionMask()
+{
+
+}
+
+CollisionMask::~CollisionMask()
+{
+}  
+
+int
+CollisionMask::get_width() const
+{
+  return 0;
+}
+
+int
+CollisionMask::get_height() const
+{
+  return 0;
+}
+
+/* EOF */

Added: branches/pingus_sdl/src/collision_mask.hpp
===================================================================
--- branches/pingus_sdl/src/collision_mask.hpp  2007-01-17 09:29:29 UTC (rev 
2673)
+++ branches/pingus_sdl/src/collision_mask.hpp  2007-01-17 10:15:39 UTC (rev 
2674)
@@ -0,0 +1,43 @@
+/*  $Id$
+**   __      __ __             ___        __   __ __   __
+**  /  \    /  \__| ____    __| _/_______/  |_|__|  | |  |   ____
+**  \   \/\/   /  |/    \  / __ |/  ___/\   __\  |  | |  | _/ __ \
+**   \        /|  |   |  \/ /_/ |\___ \  |  | |  |  |_|  |_\  ___/
+**    \__/\  / |__|___|  /\____ /____  > |__| |__|____/____/\___  >
+**         \/          \/      \/    \/                         \/
+**  Copyright (C) 2005 Ingo Ruhnke <address@hidden>
+**
+**  This program is free software; you can redistribute it and/or
+**  modify it under the terms of the GNU General Public License
+**  as published by the Free Software Foundation; either version 2
+**  of the License, or (at your option) any later version.
+**
+**  This program is distributed in the hope that it will be useful,
+**  but WITHOUT ANY WARRANTY; without even the implied warranty of
+**  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**  GNU General Public License for more details.
+** 
+**  You should have received a copy of the GNU General Public License
+**  along with this program; if not, write to the Free Software
+**  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+**  02111-1307, USA.
+*/
+
+#ifndef HEADER_COLLISION_MASK_HPP
+#define HEADER_COLLISION_MASK_HPP
+
+/** */
+class CollisionMask
+{
+private:
+public:
+  CollisionMask();
+  ~CollisionMask();
+  
+  int get_width() const;
+  int get_height() const;
+};
+
+#endif
+
+/* EOF */

Modified: branches/pingus_sdl/src/pingu_action.hxx
===================================================================
--- branches/pingus_sdl/src/pingu_action.hxx    2007-01-17 09:29:29 UTC (rev 
2673)
+++ branches/pingus_sdl/src/pingu_action.hxx    2007-01-17 10:15:39 UTC (rev 
2674)
@@ -22,6 +22,7 @@
 
 #include "pingu_enums.hxx"
 #include "pixel_buffer.hpp"
+#include "collision_mask.hpp"
 
 class ActionHolder;
 class SceneContext;

Modified: branches/pingus_sdl/src/resource.cxx
===================================================================
--- branches/pingus_sdl/src/resource.cxx        2007-01-17 09:29:29 UTC (rev 
2673)
+++ branches/pingus_sdl/src/resource.cxx        2007-01-17 10:15:39 UTC (rev 
2674)
@@ -146,6 +146,12 @@
 }
 #endif
 
+CollisionMask
+Resource::load_collision_mask(const std::string& name_)
+{
+  return CollisionMask();
+}
+
 PixelBuffer
 Resource::load_pixelbuffer(const ResDescriptor& desc_)
 {

Modified: branches/pingus_sdl/src/resource.hxx
===================================================================
--- branches/pingus_sdl/src/resource.hxx        2007-01-17 09:29:29 UTC (rev 
2673)
+++ branches/pingus_sdl/src/resource.hxx        2007-01-17 10:15:39 UTC (rev 
2674)
@@ -26,10 +26,10 @@
 #include "pixel_buffer.hpp"
 #include "res_descriptor.hxx"
 #include "resource_manager.hpp"
+#include "collision_mask.hpp"
 
 class CL_ResourceManager;
 
-
 /** General Resource Managing class, it provides wrappers around
     CL_Surface::load(), CL_Font::load() and friends.  This class is
     needed to do a better handling of the resources. */
@@ -71,10 +71,11 @@
   /** Load a surface from the ResDescriptor */
   static CL_Surface load_surface(const ResDescriptor&);
 #endif
-  static Sprite  load_sprite(const ResDescriptor&);
-  static Sprite  load_sprite(const std::string& res_name);
-  static PixelBuffer load_pixelbuffer(const std::string& res_name);
-  static PixelBuffer load_pixelbuffer(const ResDescriptor&);
+  static Sprite        load_sprite(const ResDescriptor&);
+  static Sprite        load_sprite(const std::string& res_name);
+  static CollisionMask load_collision_mask(const std::string& res_name);
+  static PixelBuffer   load_pixelbuffer(const std::string& res_name);
+  static PixelBuffer   load_pixelbuffer(const ResDescriptor&);
 
 #if 0
   static CL_Sprite  load_sprite(const std::string& res_name);

Modified: branches/pingus_sdl/src/world.cxx
===================================================================
--- branches/pingus_sdl/src/world.cxx   2007-01-17 09:29:29 UTC (rev 2673)
+++ branches/pingus_sdl/src/world.cxx   2007-01-17 10:15:39 UTC (rev 2674)
@@ -274,5 +274,24 @@
   return gravitational_acceleration;
 }
 
+void
+World::put(int x, int y, Groundtype::GPType p)
+{
+}
 
+void
+World::put(const CollisionMask&, int x, int y, Groundtype::GPType)
+{
+}
+
+void
+World::remove(int x, int y)
+{
+}
+
+void
+World::remove(const CollisionMask&, int x, int y)
+{
+}
+
 /* EOF */

Modified: branches/pingus_sdl/src/world.hxx
===================================================================
--- branches/pingus_sdl/src/world.hxx   2007-01-17 09:29:29 UTC (rev 2673)
+++ branches/pingus_sdl/src/world.hxx   2007-01-17 10:15:39 UTC (rev 2674)
@@ -24,6 +24,8 @@
 #include <vector>
 #include <string>
 #include "math/color.hpp"
+#include "groundtype.hxx"
+#include "collision_mask.hpp"
 
 // Forward declarations
 class Vector3f;
@@ -127,6 +129,12 @@
   /** @return A pointer to the gfx map of this world */
   GroundMap* get_gfx_map();
 
+  void put(int x, int y, Groundtype::GPType p = Groundtype::GP_GROUND);
+  void put(const CollisionMask&, int x, int y, Groundtype::GPType);
+
+  void remove(int x, int y);
+  void remove(const CollisionMask&, int x, int y);
+
   /** @return A pointer to the worlds pingu particle holder */
   Particles::PinguParticleHolder* get_pingu_particle_holder () { return 
pingu_particle_holder; }