[Super-tux-commit] supertux/src badguy.cpp,1.67,1.68 badguy.h,1.37,1.38

[Ricardo C. <rm...@us...>]

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

Modified Files:
	badguy.cpp badguy.h 
Log Message:
Added explode(). Avoid duplicated code, futhermore, allows any badguy to explode.

Index: badguy.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- badguy.h	2 May 2004 21:28:32 -0000	1.37
+++ badguy.h	8 May 2004 23:46:43 -0000	1.38
@@ -111,6 +111,8 @@
   void draw();
   std::string type() { return "BadGuy"; };
 
+  void explode(BadGuy* badguy);
+
   void collision(void* p_c_object, int c_object,
                  CollisionType type = COLLISION_NORMAL);
 

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- badguy.cpp	8 May 2004 23:21:21 -0000	1.67
+++ badguy.cpp	8 May 2004 23:46:43 -0000	1.68
@@ -929,6 +929,12 @@
   play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER);
 }
 
+void BadGuy::explode(BadGuy *badguy)
+{
+World::current()->add_bad_guy(badguy->base.x, badguy->base.y, BAD_BOMB);
+badguy->remove_me();
+}
+
 void
 BadGuy::collision(void *p_c_object, int c_object, CollisionType type)
 {
@@ -974,9 +980,7 @@
         if (pbad_c->kind == BAD_MRBOMB)
         {
           // mrbomb transforms into a bomb now
-          World::current()->add_bad_guy(pbad_c->base.x, pbad_c->base.y,
-                                        BAD_BOMB);
-          pbad_c->remove_me();
+          explode(pbad_c);
           return;
         }
         else if (pbad_c->kind != BAD_MRBOMB)
@@ -991,9 +995,7 @@
         if (pbad_c->kind == BAD_MRBOMB)
         {
           // mrbomb transforms into a bomb now
-          World::current()->add_bad_guy(pbad_c->base.x, pbad_c->base.y,
-                                        BAD_BOMB);
-          pbad_c->remove_me();
+          explode(pbad_c);
           return;
         }
         else
@@ -1074,6 +1076,7 @@
     }
 }
 
+
 //---------------------------------------------------------------------------
 
 void load_badguy_gfx()