[Pingus-CVS] r3685 - in trunk/pingus/src: . actions components particles worldobjs

[grumbel at BerliOS]

Author: grumbel
Date: 2008-07-05 05:50:04 +0200 (Sat, 05 Jul 2008)
New Revision: 3685

Modified:
   trunk/pingus/src/actions/basher.cpp
   trunk/pingus/src/actions/blocker.cpp
   trunk/pingus/src/actions/bomber.cpp
   trunk/pingus/src/actions/bridger.cpp
   trunk/pingus/src/actions/climber.cpp
   trunk/pingus/src/actions/digger.cpp
   trunk/pingus/src/actions/faller.cpp
   trunk/pingus/src/actions/miner.cpp
   trunk/pingus/src/actions/slider.cpp
   trunk/pingus/src/actions/walker.cpp
   trunk/pingus/src/collider.cpp
   trunk/pingus/src/collision_map.cpp
   trunk/pingus/src/components/smallmap.cpp
   trunk/pingus/src/ground_map.cpp
   trunk/pingus/src/particles/explosive_particle.cpp
   trunk/pingus/src/particles/pingu_particle_holder.cpp
   trunk/pingus/src/particles/rain_particle_holder.cpp
   trunk/pingus/src/particles/snow_particle_holder.cpp
   trunk/pingus/src/pingu.cpp
   trunk/pingus/src/pingu_action.cpp
   trunk/pingus/src/smallmap_image.cpp
   trunk/pingus/src/world.cpp
   trunk/pingus/src/worldobjs/conveyor_belt.cpp
   trunk/pingus/src/worldobjs/exit.cpp
   trunk/pingus/src/worldobjs/groundpiece.cpp
   trunk/pingus/src/worldobjs/ice_block.cpp
   trunk/pingus/src/worldobjs/liquid.cpp
   trunk/pingus/src/worldobjs/smasher.cpp
   trunk/pingus/src/worldobjs/switch_door.cpp
Log:
Renamed ColMap to CollisionMap

Modified: trunk/pingus/src/actions/basher.cpp
===================================================================
--- trunk/pingus/src/actions/basher.cpp 2008-07-05 03:35:00 UTC (rev 3684)
+++ trunk/pingus/src/actions/basher.cpp 2008-07-05 03:50:04 UTC (rev 3685)
@@ -15,7 +15,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../sound/sound.hpp"
-#include "../col_map.hpp"
+#include "../collision_map.hpp"
 #include "../debug.hpp"
 #include "../globals.hpp"
 #include "../display/scene_context.hpp"

Modified: trunk/pingus/src/actions/blocker.cpp
===================================================================
--- trunk/pingus/src/actions/blocker.cpp        2008-07-05 03:35:00 UTC (rev 
3684)
+++ trunk/pingus/src/actions/blocker.cpp        2008-07-05 03:50:04 UTC (rev 
3685)
@@ -14,7 +14,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "../col_map.hpp"
 #include "../display/scene_context.hpp"
 #include "../pingu.hpp"
 #include "../pingu_holder.hpp"

Modified: trunk/pingus/src/actions/bomber.cpp
===================================================================
--- trunk/pingus/src/actions/bomber.cpp 2008-07-05 03:35:00 UTC (rev 3684)
+++ trunk/pingus/src/actions/bomber.cpp 2008-07-05 03:50:04 UTC (rev 3685)
@@ -16,7 +16,6 @@
 
 #include "../debug.hpp"
 #include "../globals.hpp"
-#include "../col_map.hpp"
 #include "../display/scene_context.hpp"
 #include "../pingu.hpp"
 #include "../pingu_enums.hpp"

Modified: trunk/pingus/src/actions/bridger.cpp
===================================================================
--- trunk/pingus/src/actions/bridger.cpp        2008-07-05 03:35:00 UTC (rev 
3684)
+++ trunk/pingus/src/actions/bridger.cpp        2008-07-05 03:50:04 UTC (rev 
3685)
@@ -15,7 +15,6 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
-#include "../col_map.hpp"
 #include "../display/scene_context.hpp"
 #include "../pingu.hpp"
 #include "../ground_map.hpp"

Modified: trunk/pingus/src/actions/climber.cpp
===================================================================
--- trunk/pingus/src/actions/climber.cpp        2008-07-05 03:35:00 UTC (rev 
3684)
+++ trunk/pingus/src/actions/climber.cpp        2008-07-05 03:50:04 UTC (rev 
3685)
@@ -14,8 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "../col_map.hpp"
 #include "../display/scene_context.hpp"
+#include "../groundtype.hpp"
 #include "../pingu.hpp"
 #include "climber.hpp"
 

Modified: trunk/pingus/src/actions/digger.cpp
===================================================================
--- trunk/pingus/src/actions/digger.cpp 2008-07-05 03:35:00 UTC (rev 3684)
+++ trunk/pingus/src/actions/digger.cpp 2008-07-05 03:50:04 UTC (rev 3685)
@@ -15,7 +15,6 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cstdio>
-#include "../col_map.hpp"
 #include "../display/scene_context.hpp"
 #include "../ground_map.hpp"
 #include "../world.hpp"

Modified: trunk/pingus/src/actions/faller.cpp
===================================================================
--- trunk/pingus/src/actions/faller.cpp 2008-07-05 03:35:00 UTC (rev 3684)
+++ trunk/pingus/src/actions/faller.cpp 2008-07-05 03:50:04 UTC (rev 3685)
@@ -15,7 +15,6 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../math.hpp"
-#include "../col_map.hpp"
 #include "../colliders/pingu_collider.hpp"
 #include "../debug.hpp"
 #include "../globals.hpp"

Modified: trunk/pingus/src/actions/miner.cpp
===================================================================
--- trunk/pingus/src/actions/miner.cpp  2008-07-05 03:35:00 UTC (rev 3684)
+++ trunk/pingus/src/actions/miner.cpp  2008-07-05 03:50:04 UTC (rev 3685)
@@ -16,7 +16,6 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../ground_map.hpp"
-#include "../col_map.hpp"
 #include "../display/scene_context.hpp"
 #include "../world.hpp"
 #include "../sound/sound.hpp"

Modified: trunk/pingus/src/actions/slider.cpp
===================================================================
--- trunk/pingus/src/actions/slider.cpp 2008-07-05 03:35:00 UTC (rev 3684)
+++ trunk/pingus/src/actions/slider.cpp 2008-07-05 03:50:04 UTC (rev 3685)
@@ -14,9 +14,9 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "../col_map.hpp"
 #include "../display/scene_context.hpp"
 #include "../pingu.hpp"
+#include "../groundtype.hpp"
 #include "slider.hpp"
 
 namespace Actions {

Modified: trunk/pingus/src/actions/walker.cpp
===================================================================
--- trunk/pingus/src/actions/walker.cpp 2008-07-05 03:35:00 UTC (rev 3684)
+++ trunk/pingus/src/actions/walker.cpp 2008-07-05 03:50:04 UTC (rev 3685)
@@ -14,11 +14,11 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "../col_map.hpp"
 #include "../globals.hpp"
 #include "../display/scene_context.hpp"
 #include "../pingu.hpp"
 #include "../debug.hpp"
+#include "../groundtype.hpp"
 #include "walker.hpp"
 
 namespace Actions {

Modified: trunk/pingus/src/collider.cpp
===================================================================
--- trunk/pingus/src/collider.cpp       2008-07-05 03:35:00 UTC (rev 3684)
+++ trunk/pingus/src/collider.cpp       2008-07-05 03:50:04 UTC (rev 3685)
@@ -15,7 +15,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "collider.hpp"
-#include "col_map.hpp"
+#include "collision_map.hpp"
 #include "math/vector3f.hpp"
 #include "world.hpp"
 

Modified: trunk/pingus/src/collision_map.cpp
===================================================================
--- trunk/pingus/src/collision_map.cpp  2008-07-05 03:35:00 UTC (rev 3684)
+++ trunk/pingus/src/collision_map.cpp  2008-07-05 03:50:04 UTC (rev 3685)
@@ -18,7 +18,7 @@
 #include "SDL.h"
 #include "display/drawing_context.hpp"
 #include "globals.hpp"
-#include "col_map.hpp"
+#include "collision_map.hpp"
 #include "collision_mask.hpp"
 #include "pingus_error.hpp"
 #include "math.hpp"

Modified: trunk/pingus/src/components/smallmap.cpp
===================================================================
--- trunk/pingus/src/components/smallmap.cpp    2008-07-05 03:35:00 UTC (rev 
3684)
+++ trunk/pingus/src/components/smallmap.cpp    2008-07-05 03:50:04 UTC (rev 
3685)
@@ -20,7 +20,6 @@
 #include "../display/drawing_context.hpp"
 #include "../world.hpp"
 #include "../resource.hpp"
-#include "../col_map.hpp"
 #include "../server.hpp"
 #include "../smallmap_image.hpp"
 #include "../pingu.hpp"

Modified: trunk/pingus/src/ground_map.cpp
===================================================================
--- trunk/pingus/src/ground_map.cpp     2008-07-05 03:35:00 UTC (rev 3684)
+++ trunk/pingus/src/ground_map.cpp     2008-07-05 03:50:04 UTC (rev 3685)
@@ -22,7 +22,7 @@
 #include "ground_map.hpp"
 #include "pingus_level.hpp"
 #include "gettext.h"
-#include "col_map.hpp"
+#include "collision_map.hpp"
 #include "math.hpp"
 #include "SDL.h"
 

Modified: trunk/pingus/src/particles/explosive_particle.cpp
===================================================================
--- trunk/pingus/src/particles/explosive_particle.cpp   2008-07-05 03:35:00 UTC 
(rev 3684)
+++ trunk/pingus/src/particles/explosive_particle.cpp   2008-07-05 03:50:04 UTC 
(rev 3685)
@@ -14,7 +14,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if 0
-#include "../col_map.hpp"
+#include "../collision_map.hpp"
 #include "../pingu_map.hpp"
 #include "../world.hpp"
 #include "../particles/particle_holder.hpp"

Modified: trunk/pingus/src/particles/pingu_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/pingu_particle_holder.cpp        2008-07-05 
03:35:00 UTC (rev 3684)
+++ trunk/pingus/src/particles/pingu_particle_holder.cpp        2008-07-05 
03:50:04 UTC (rev 3685)
@@ -16,7 +16,7 @@
 
 #include "../display/scene_context.hpp"
 #include "../math.hpp"
-#include "../col_map.hpp"
+#include "../collision_map.hpp"
 #include "../resource.hpp"
 #include "../world.hpp"
 #include "pingu_particle_holder.hpp"

Modified: trunk/pingus/src/particles/rain_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/rain_particle_holder.cpp 2008-07-05 03:35:00 UTC 
(rev 3684)
+++ trunk/pingus/src/particles/rain_particle_holder.cpp 2008-07-05 03:50:04 UTC 
(rev 3685)
@@ -16,7 +16,7 @@
 
 #include "../display/scene_context.hpp"
 #include "../math.hpp"
-#include "../col_map.hpp"
+#include "../collision_map.hpp"
 #include "../globals.hpp"
 #include "../resource.hpp"
 #include "../world.hpp"

Modified: trunk/pingus/src/particles/snow_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/snow_particle_holder.cpp 2008-07-05 03:35:00 UTC 
(rev 3684)
+++ trunk/pingus/src/particles/snow_particle_holder.cpp 2008-07-05 03:50:04 UTC 
(rev 3685)
@@ -16,7 +16,7 @@
 
 #include <assert.h>
 #include "../math.hpp"
-#include "../col_map.hpp"
+#include "../collision_map.hpp"
 #include "../display/scene_context.hpp"
 #include "../ground_map.hpp"
 #include "../resource.hpp"

Modified: trunk/pingus/src/pingu.cpp
===================================================================
--- trunk/pingus/src/pingu.cpp  2008-07-05 03:35:00 UTC (rev 3684)
+++ trunk/pingus/src/pingu.cpp  2008-07-05 03:50:04 UTC (rev 3685)
@@ -21,7 +21,7 @@
 #include "globals.hpp"
 #include "world.hpp"
 #include "sound/sound.hpp"
-#include "col_map.hpp"
+#include "collision_map.hpp"
 #include "pingu_action.hpp"
 #include "pingu_action_factory.hpp"
 #include "gettext.h"

Modified: trunk/pingus/src/pingu_action.cpp
===================================================================
--- trunk/pingus/src/pingu_action.cpp   2008-07-05 03:35:00 UTC (rev 3684)
+++ trunk/pingus/src/pingu_action.cpp   2008-07-05 03:50:04 UTC (rev 3685)
@@ -17,7 +17,7 @@
 #include <assert.h>
 #include "math.hpp"
 #include "math/vector3f.hpp"
-#include "col_map.hpp"
+#include "collision_map.hpp"
 #include "world.hpp"
 #include "pingu.hpp"
 #include "pingu_action.hpp"

Modified: trunk/pingus/src/smallmap_image.cpp
===================================================================
--- trunk/pingus/src/smallmap_image.cpp 2008-07-05 03:35:00 UTC (rev 3684)
+++ trunk/pingus/src/smallmap_image.cpp 2008-07-05 03:50:04 UTC (rev 3685)
@@ -17,7 +17,7 @@
 #include <iostream>
 #include "world.hpp"
 #include "smallmap_image.hpp"
-#include "col_map.hpp"
+#include "collision_map.hpp"
 #include "server.hpp"
 
 SmallMapImage::SmallMapImage(Server* s, int width, int height)

Modified: trunk/pingus/src/world.cpp
===================================================================
--- trunk/pingus/src/world.cpp  2008-07-05 03:35:00 UTC (rev 3684)
+++ trunk/pingus/src/world.cpp  2008-07-05 03:50:04 UTC (rev 3685)
@@ -32,7 +32,7 @@
 #include "display/scene_context.hpp"
 #include "pingus_level.hpp"
 #include "worldobj_factory.hpp"
-#include "col_map.hpp"
+#include "collision_map.hpp"
 #include "debug.hpp"
 
 using Actions::Bomber;

Modified: trunk/pingus/src/worldobjs/conveyor_belt.cpp
===================================================================
--- trunk/pingus/src/worldobjs/conveyor_belt.cpp        2008-07-05 03:35:00 UTC 
(rev 3684)
+++ trunk/pingus/src/worldobjs/conveyor_belt.cpp        2008-07-05 03:50:04 UTC 
(rev 3685)
@@ -14,7 +14,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "../col_map.hpp"
+#include "../collision_map.hpp"
 #include "../display/scene_context.hpp"
 #include "../pingu.hpp"
 #include "../pingu_holder.hpp"

Modified: trunk/pingus/src/worldobjs/exit.cpp
===================================================================
--- trunk/pingus/src/worldobjs/exit.cpp 2008-07-05 03:35:00 UTC (rev 3684)
+++ trunk/pingus/src/worldobjs/exit.cpp 2008-07-05 03:50:04 UTC (rev 3685)
@@ -16,7 +16,7 @@
 
 #include <iostream>
 #include "../display/scene_context.hpp"
-#include "../col_map.hpp"
+#include "../collision_map.hpp"
 #include "../world.hpp"
 #include "../globals.hpp"
 #include "../pingu_holder.hpp"

Modified: trunk/pingus/src/worldobjs/groundpiece.cpp
===================================================================
--- trunk/pingus/src/worldobjs/groundpiece.cpp  2008-07-05 03:35:00 UTC (rev 
3684)
+++ trunk/pingus/src/worldobjs/groundpiece.cpp  2008-07-05 03:50:04 UTC (rev 
3685)
@@ -17,7 +17,7 @@
 #include <iostream>
 #include "../world.hpp"
 #include "../ground_map.hpp"
-#include "../col_map.hpp"
+#include "../collision_map.hpp"
 #include "../resource.hpp"
 #include "groundpiece.hpp"
 

Modified: trunk/pingus/src/worldobjs/ice_block.cpp
===================================================================
--- trunk/pingus/src/worldobjs/ice_block.cpp    2008-07-05 03:35:00 UTC (rev 
3684)
+++ trunk/pingus/src/worldobjs/ice_block.cpp    2008-07-05 03:50:04 UTC (rev 
3685)
@@ -14,7 +14,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "../col_map.hpp"
+#include "../collision_map.hpp"
 #include "../display/scene_context.hpp"
 #include "../pingu.hpp"
 #include "../pingu_holder.hpp"

Modified: trunk/pingus/src/worldobjs/liquid.cpp
===================================================================
--- trunk/pingus/src/worldobjs/liquid.cpp       2008-07-05 03:35:00 UTC (rev 
3684)
+++ trunk/pingus/src/worldobjs/liquid.cpp       2008-07-05 03:50:04 UTC (rev 
3685)
@@ -15,7 +15,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
-#include "../col_map.hpp"
+#include "../collision_map.hpp"
 #include "../display/scene_context.hpp"
 #include "../resource.hpp"
 #include "../world.hpp"

Modified: trunk/pingus/src/worldobjs/smasher.cpp
===================================================================
--- trunk/pingus/src/worldobjs/smasher.cpp      2008-07-05 03:35:00 UTC (rev 
3684)
+++ trunk/pingus/src/worldobjs/smasher.cpp      2008-07-05 03:50:04 UTC (rev 
3685)
@@ -16,7 +16,7 @@
 
 #include <iostream>
 #include "../math.hpp"
-#include "../col_map.hpp"
+#include "../collision_map.hpp"
 #include "../display/scene_context.hpp"
 #include "../particles/smoke_particle_holder.hpp"
 #include "../pingu.hpp"

Modified: trunk/pingus/src/worldobjs/switch_door.cpp
===================================================================
--- trunk/pingus/src/worldobjs/switch_door.cpp  2008-07-05 03:35:00 UTC (rev 
3684)
+++ trunk/pingus/src/worldobjs/switch_door.cpp  2008-07-05 03:50:04 UTC (rev 
3685)
@@ -14,7 +14,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "../col_map.hpp"
+#include "../collision_map.hpp"
 #include "../display/scene_context.hpp"
 #include "../pingu.hpp"
 #include "../pingu_holder.hpp"