X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy.cpp;h=5e496ec4ae59b8db779e927183650115649e007f;hb=e68610f027ad6f35025d9aca87202ceb4501e97e;hp=d26dc2a3f502c4f8e94d1ec8da1fa6310b0e29e6;hpb=d225a524f3d898138bd2771313c177b364773ff6;p=supertux.git diff --git a/src/badguy.cpp b/src/badguy.cpp index d26dc2a3f..5e496ec4a 100644 --- a/src/badguy.cpp +++ b/src/badguy.cpp @@ -210,6 +210,7 @@ BadGuy::activate(Direction activation_dir) frozen_timer.init(true); timer.init(true); + dying = DYING_NOT; seen = true; dir = activation_dir; @@ -904,7 +905,7 @@ BadGuy::action(float elapsed_time) if(!seen) return; - + switch (kind) { case BAD_MRICEBLOCK: @@ -1226,9 +1227,6 @@ BadGuy::collision(const MovingObject&, int) void BadGuy::collision(void *p_c_object, int c_object, CollisionType type) { - if(!seen) - return; - BadGuy* pbad_c = NULL; Bullet* pbullet_c = NULL;