[Pingus-CVS] r2750 - branches/pingus_sdl/src/worldobjs

[jsalmon3]

Author: jsalmon3
Date: 2007-07-17 18:41:48 +0200 (Tue, 17 Jul 2007)
New Revision: 2750

Modified:
   branches/pingus_sdl/src/worldobjs/liquid.cpp
Log:
Undo last change, use water_cmap instead

Modified: branches/pingus_sdl/src/worldobjs/liquid.cpp
===================================================================
--- branches/pingus_sdl/src/worldobjs/liquid.cpp        2007-07-17 16:24:34 UTC 
(rev 2749)
+++ branches/pingus_sdl/src/worldobjs/liquid.cpp        2007-07-17 16:41:48 UTC 
(rev 2750)
@@ -58,21 +58,13 @@
 void
 Liquid::on_startup ()
 {
-  CollisionMask mask = Resource::load_collision_mask("liquids/water");
+  CollisionMask mask = Resource::load_collision_mask("liquids/water_cmap");
 
-  for (int x = static_cast<int>(pos.x);
-      x < pos.x + width;
-      x += sur.get_width())
-    {
-      for (int i = 0; i < sur.get_frame_count(); ++i)
-        {
-          sur.set_frame(i);
-          world->get_colmap()->put(mask,
-                     static_cast<int>(pos.x + x),
-                     static_cast<int>(pos.y),
-                     Groundtype::GP_WATER);
-        }
-    }
+  for(int i=0; i < width; ++i)
+    world->get_colmap()->put(mask,
+               static_cast<int>(pos.x + i),
+               static_cast<int>(pos.y),
+               Groundtype::GP_WATER);
 }
 
 void