[Super-tux-commit] supertux/src special.cpp,1.37,1.38 world.cpp,1.46,1.47

[Ingo R. <gr...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6526

Modified Files:
	special.cpp world.cpp 
Log Message:
- memleak fix for my last patch
- iceflower/growup crash fix (well, maybe)

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- world.cpp	28 Apr 2004 20:24:34 -0000	1.46
+++ world.cpp	28 Apr 2004 20:34:24 -0000	1.47
@@ -105,6 +105,22 @@
   for (ParticleSystems::iterator i = particle_systems.begin();
           i != particle_systems.end(); ++i)
     delete *i;
+
+  for (std::vector<BouncyDistro*>::iterator i = bouncy_distros.begin();
+       i != bouncy_distros.end(); ++i)
+    delete *i;
+  
+  for (std::vector<BrokenBrick*>::iterator i = broken_bricks.begin();
+       i != broken_bricks.end(); ++i)
+    delete *i;
+  
+  for (std::vector<BouncyBrick*>::iterator i = bouncy_bricks.begin();
+       i != bouncy_bricks.end(); ++i)
+    delete *i;
+
+  for (std::vector<FloatingScore*>::iterator i = floating_scores.begin();
+       i != floating_scores.end(); ++i)
+    delete *i;
   
   delete level;
 }

Index: special.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- special.cpp	28 Apr 2004 20:24:34 -0000	1.37
+++ special.cpp	28 Apr 2004 20:34:24 -0000	1.38
@@ -333,12 +333,6 @@
           pplayer->size = BIG;
           pplayer->base.height = 64;
 	  pplayer->base.y -= 32;
-	  if(collision_object_map(pplayer->base))
-            {
-              pplayer->base.height = 32;
-              pplayer->base.y += 32;
-              pplayer->duck = true;
-            }
         }
       else if (kind == UPGRADE_ICEFLOWER)
         {