X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy.h;h=60b74c3089f92ceb9d2a300b20163e9a7fa0bd8d;hb=36cc92dc67c4cfdaceed7d47a4aa6992b407d1df;hp=1d04a3ce5947fcd82af96627b27cc9257e67f469;hpb=8761e2ea313a12d7de3a1a8d2d5d7a1fcec32158;p=supertux.git diff --git a/src/badguy.h b/src/badguy.h index 1d04a3ce5..60b74c308 100644 --- a/src/badguy.h +++ b/src/badguy.h @@ -18,6 +18,7 @@ #include "type.h" #include "timer.h" #include "texture.h" +#include "physic.h" #include "collision.h" /* Enemy modes: */ @@ -32,13 +33,15 @@ typedef struct bad_guy_type { int mode; - int dying; + DyingType dying; int kind; - int seen; + bool seen; int dir; int frame; base_type base; + base_type old_base; timer_type timer; + physic_type physic; } bad_guy_type; @@ -50,15 +53,15 @@ enum { BAD_MONEY }; -texture_type img_bsod_squished_left, img_bsod_squished_right, +extern texture_type img_bsod_squished_left, img_bsod_squished_right, img_bsod_falling_left, img_bsod_falling_right, img_laptop_flat_left, img_laptop_flat_right, img_laptop_falling_left, img_laptop_falling_right; -texture_type img_bsod_left[4], img_bsod_right[4], +extern texture_type img_bsod_left[4], img_bsod_right[4], img_laptop_left[3], img_laptop_right[3], img_money_left[2], img_money_right[2]; -bitmask *bm_bsod; +extern bitmask *bm_bsod; void badguy_create_bitmasks();