moved savelevel() code to level.h/c where it belongs to. :)

[supertux.git] / src / badguy.h

diff --git a/src/badguy.h b/src/badguy.h
index 5f357cc..1d04a3c 100644 (file)
--- a/src/badguy.h
+++ b/src/badguy.h
@@ -16,10 +16,10 @@
 #include "SDL.h"
 #include "bitmask.h"
 #include "type.h"
+#include "timer.h"
+#include "texture.h"
 #include "collision.h"
 
-#define NUM_BAD_GUYS 128
-
 /* Enemy modes: */
 
 #define NORMAL 0
@@ -31,21 +31,13 @@
 
 typedef struct bad_guy_type
   {
-    int alive;
     int mode;
     int dying;
     int kind;
     int seen;
     int dir;
     int frame;
-    float x;
-    float y;
-    float xm;
-    float ym;
-    float width;
-    float height;
-    unsigned int updated;
-    itop_type it;
+    base_type base;
     timer_type timer;
   }
 bad_guy_type;
@@ -70,7 +62,7 @@ bitmask *bm_bsod;
 
 void badguy_create_bitmasks();
 
-void badguy_init(bad_guy_type* pbad);
+void badguy_init(bad_guy_type* pbad, float x, float y, int kind);
 void badguy_action(bad_guy_type* pbad);
 void badguy_draw(bad_guy_type* pbad);
 void badguy_collision(bad_guy_type* pbad, void* p_c_object, int c_object);