X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fyeti.h;h=5e42965c45bf1c2a671085c5718c290716a6889c;hb=e8a1d89d3d0f4824d3d906ca67149afec0a75e4b;hp=3910097aa6d8ec0dbd606707c1af12960104f021;hpb=1d613f782e21f55f915b6e5fa808e7435896461a;p=supertux.git diff --git a/src/badguy/yeti.h b/src/badguy/yeti.h index 3910097aa..5e42965c4 100644 --- a/src/badguy/yeti.h +++ b/src/badguy/yeti.h @@ -12,13 +12,16 @@ public: void write(lisp::Writer& writer); void active_action(float elapsed_time); HitResponse collision_solid(GameObject& other, const CollisionHit& hit); + HitResponse collision_player(Player& player, const CollisionHit& hit); bool collision_squished(Player& player); + void kill_fall(); private: void go_right(); void go_left(); void angry_jumping(); void drop_stalactite(); + void summon_snowball(); enum YetiState { INIT, @@ -27,15 +30,12 @@ private: GO_RIGHT, GO_LEFT }; - enum Side { - LEFT, - RIGHT - }; - Side side; + Direction side; YetiState state; Timer2 timer; int jumpcount; Mix_Chunk* sound_gna; + Mix_Chunk* sound_roar; }; #endif