<MatzeB> my patch fixes another leak in the levelsubset code and cleans that up a...

[supertux.git] / src / badguy.h

diff --git a/src/badguy.h b/src/badguy.h
index 13b628b..1511e6b 100644 (file)
--- a/src/badguy.h
+++ b/src/badguy.h
@@ -35,7 +35,6 @@
 
 /* Bad guy kinds: */
 enum BadGuyKind {
-  BAD_BSOD,
   BAD_MRICEBLOCK,
   BAD_JUMPY,
   BAD_MRBOMB,
@@ -65,7 +64,7 @@ struct BadGuyData
     : kind(kind_), x(x_), y(y_), stay_on_platform(stay_on_platform_) {}
 
   BadGuyData()
-    : kind(BAD_BSOD), x(0), y(0), stay_on_platform(false) {}
+    : kind(BAD_SNOWBALL), x(0), y(0), stay_on_platform(false) {}
 };
 
 class Player;
@@ -132,7 +131,7 @@ public:
   /** this functions tries to kill the badguy and lets him fall off the
    * screen. Some badguys like the flame might ignore this.
    */
-  void kill_me();
+  void kill_me(int score);
 
   /** remove ourself from the list of badguys. WARNING! This function will
    * invalidate all members. So don't do anything else with member after calling
@@ -142,7 +141,6 @@ public:
   bool is_removable() const { return removable; }
  
 private:
-  void action_bsod(float frame_ratio);
   void action_mriceblock(float frame_ratio);
   void action_jumpy(float frame_ratio); 
   void action_bomb(float frame_ratio);