[Pingus-CVS] r3846 - in trunk/pingus/src: . particles worldobjs

[grumbel at BerliOS]

Author: grumbel
Date: 2008-07-17 01:25:47 +0200 (Thu, 17 Jul 2008)
New Revision: 3846

Modified:
   trunk/pingus/src/particles/explosive_particle.cpp
   trunk/pingus/src/particles/snow_particle_holder.cpp
   trunk/pingus/src/resource.cpp
   trunk/pingus/src/resource.hpp
   trunk/pingus/src/worldobjs/conveyor_belt.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:
Removed Resource::load_collision_mask()

Modified: trunk/pingus/src/particles/explosive_particle.cpp
===================================================================
--- trunk/pingus/src/particles/explosive_particle.cpp   2008-07-16 23:22:37 UTC 
(rev 3845)
+++ trunk/pingus/src/particles/explosive_particle.cpp   2008-07-16 23:25:47 UTC 
(rev 3846)
@@ -70,7 +70,7 @@
   alive = false;
   WorldObj::get_world()->get_particle_holder ()->add_pingu_explo((int)pos.x, 
(int)pos.y);
 
-  CollisionMask mask = Resource::load_collision_mask("Other/bomber_radius", 
"pingus");
+  CollisionMask mask("Other/bomber_radius", "pingus");
   WorldObj::get_world()->remove(mask,
                                 int(pos.x) - (bomber_radius.get_width()/2),
                                 int(pos.y) - (bomber_radius.get_height()/2));

Modified: trunk/pingus/src/particles/snow_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/snow_particle_holder.cpp 2008-07-16 23:22:37 UTC 
(rev 3845)
+++ trunk/pingus/src/particles/snow_particle_holder.cpp 2008-07-16 23:25:47 UTC 
(rev 3846)
@@ -59,7 +59,7 @@
     snow3("particles/snow3"),
     snow4("particles/snow4"),
     snow5("particles/snow5"),
-    ground(Resource::load_collision_mask("particles/ground_snow"))
+    ground("particles/ground_snow")
 {
 }
 

Modified: trunk/pingus/src/resource.cpp
===================================================================
--- trunk/pingus/src/resource.cpp       2008-07-16 23:22:37 UTC (rev 3845)
+++ trunk/pingus/src/resource.cpp       2008-07-16 23:25:47 UTC (rev 3846)
@@ -70,18 +70,6 @@
   return resmgr.get_sprite_description(res_name);
 }
 
-CollisionMask
-Resource::load_collision_mask(const std::string& name)
-{
-  return CollisionMask(name);
-}
-
-CollisionMask
-Resource::load_collision_mask(const ResDescriptor& res_desc)
-{
-  return CollisionMask(res_desc);
-}
-
 Surface
 Resource::load_surface(const ResDescriptor& desc_)
 {

Modified: trunk/pingus/src/resource.hpp
===================================================================
--- trunk/pingus/src/resource.hpp       2008-07-16 23:22:37 UTC (rev 3845)
+++ trunk/pingus/src/resource.hpp       2008-07-16 23:25:47 UTC (rev 3846)
@@ -40,9 +40,6 @@
 
   static SpriteDescription* load_sprite_desc(const std::string& res_name);
 
-  static CollisionMask load_collision_mask(const std::string& res_name);
-  static CollisionMask load_collision_mask(const ResDescriptor&);
-
   static Surface       load_surface(const std::string& res_name);
   static Surface       load_surface(const ResDescriptor&);
 

Modified: trunk/pingus/src/worldobjs/conveyor_belt.cpp
===================================================================
--- trunk/pingus/src/worldobjs/conveyor_belt.cpp        2008-07-16 23:22:37 UTC 
(rev 3845)
+++ trunk/pingus/src/worldobjs/conveyor_belt.cpp        2008-07-16 23:25:47 UTC 
(rev 3846)
@@ -51,7 +51,7 @@
 void
 ConveyorBelt::on_startup ()
 {
-  CollisionMask mask = 
Resource::load_collision_mask("worldobjs/conveyorbelt_cmap");
+  CollisionMask mask("worldobjs/conveyorbelt_cmap");
 
   for (int i=0; i < (width + 2); ++i)
     world->put(mask,

Modified: trunk/pingus/src/worldobjs/ice_block.cpp
===================================================================
--- trunk/pingus/src/worldobjs/ice_block.cpp    2008-07-16 23:22:37 UTC (rev 
3845)
+++ trunk/pingus/src/worldobjs/ice_block.cpp    2008-07-16 23:25:47 UTC (rev 
3846)
@@ -30,7 +30,7 @@
     is_finished(false),
     last_contact(0),
     block_sur("worldobjs/iceblock"),
-    block_sur_cmap(Resource::load_collision_mask("worldobjs/iceblock"))
+    block_sur_cmap("worldobjs/iceblock")
 {
   reader.read_vector("position", pos);
   reader.read_int   ("width",    width);

Modified: trunk/pingus/src/worldobjs/liquid.cpp
===================================================================
--- trunk/pingus/src/worldobjs/liquid.cpp       2008-07-16 23:22:37 UTC (rev 
3845)
+++ trunk/pingus/src/worldobjs/liquid.cpp       2008-07-16 23:25:47 UTC (rev 
3846)
@@ -55,7 +55,7 @@
 void
 Liquid::on_startup ()
 {
-  CollisionMask mask = Resource::load_collision_mask("liquids/water_cmap");
+  CollisionMask mask("liquids/water_cmap");
 
   for(int i=0; i < width; ++i)
     world->get_colmap()->put(mask,

Modified: trunk/pingus/src/worldobjs/smasher.cpp
===================================================================
--- trunk/pingus/src/worldobjs/smasher.cpp      2008-07-16 23:22:37 UTC (rev 
3845)
+++ trunk/pingus/src/worldobjs/smasher.cpp      2008-07-16 23:25:47 UTC (rev 
3846)
@@ -103,7 +103,7 @@
 Smasher::on_startup ()
 {
   std::cout << "Drawing colmap entry" << std::endl;
-  CollisionMask buf = Resource::load_collision_mask("traps/smasher_cmap");
+  CollisionMask buf("traps/smasher_cmap");
   world->put(buf, 
              static_cast<int>(pos.x),
              static_cast<int>(pos.y),

Modified: trunk/pingus/src/worldobjs/switch_door.cpp
===================================================================
--- trunk/pingus/src/worldobjs/switch_door.cpp  2008-07-16 23:22:37 UTC (rev 
3845)
+++ trunk/pingus/src/worldobjs/switch_door.cpp  2008-07-16 23:25:47 UTC (rev 
3846)
@@ -26,9 +26,9 @@
 
 SwitchDoor::SwitchDoor(const FileReader& reader)
   : door_box     ("worldobjs/switchdoor_box"),
-    door_box_cmap (Resource::load_collision_mask("worldobjs/switchdoor_box")),
+    door_box_cmap("worldobjs/switchdoor_box"),
     door_tile    ("worldobjs/switchdoor_tile"),
-    
door_tile_cmap(Resource::load_collision_mask("worldobjs/switchdoor_tile_cmap")),
+    door_tile_cmap("worldobjs/switchdoor_tile_cmap"),
     switch_sur   ("worldobjs/switchdoor_switch"),
     is_opening(false)
 {