#include <iostream>
#include <cassert>
-#include "gameloop.h"
#include "app/globals.h"
+#include "app/gettext.h"
#include "player.h"
#include "defines.h"
#include "scene.h"
#include "interactive_object.h"
#include "video/screen.h"
#include "statistics.h"
+#include "gameloop.h"
// behavior definitions:
#define TILES_FOR_BUTTJUMP 3
physic.enable_gravity(false);
/* Reset score multiplier (for multi-hits): */
if (!invincible_timer.started())
+ {
+ if(player_status.score_multiplier > 2)
+ { // show a message
+ char str[124];
+ sprintf(str, _("%d bad guys in a row!"), player_status.score_multiplier-1);
+ Sector::current()->add_floating_text(base, str);
+ }
player_status.score_multiplier = 1;
+ }
}
if(jumped_in_solid)
BadGuy* badguy = dynamic_cast<BadGuy*> (*i);
if(badguy)
{
-
- if (fabsf(base.x - badguy->base.x) < 150 &&
- fabsf(base.y - badguy->base.y) < 60 &&
- (issolid(badguy->base.x + 1, badguy->base.y + badguy->base.height) ||
- issolid(badguy->base.x + badguy->base.width - 1, badguy->base.y + badguy->base.height)))
- badguy->kill_me(25);
+ // don't kill when badguys are already dying or in a certain mode
+ if(badguy->dying == DYING_NOT && badguy->mode != BadGuy::BOMB_TICKING &&
+ badguy->mode != BadGuy::BOMB_EXPLODE)
+ {
+ if (fabsf(base.x - badguy->base.x) < 150 &&
+ fabsf(base.y - badguy->base.y) < 60 &&
+ (issolid(badguy->base.x + 1, badguy->base.y + badguy->base.height) ||
+ issolid(badguy->base.x + badguy->base.width - 1, badguy->base.y + badguy->base.height)))
+ badguy->kill_me(25);
+ }
}
}
}