Changed Klein's position in the final battle.

And something else I don't remember.
This commit is contained in:
onpon4 2015-02-28 18:56:24 -05:00
parent 2bac42ce61
commit 901000245b
3 changed files with 14 additions and 2 deletions

Binary file not shown.

View File

@ -592,8 +592,8 @@ void initAliens()
{ {
enemy[WC_KLINE].flags |= FL_IMMORTAL | FL_NOFIRE | FL_NOMOVE; enemy[WC_KLINE].flags |= FL_IMMORTAL | FL_NOFIRE | FL_NOMOVE;
enemy[WC_KLINE].x = (screen->w * 2) / 3; enemy[WC_KLINE].x = screen->w * 2 / 3;
enemy[WC_KLINE].y = screen->h / 2; enemy[WC_KLINE].y = screen->h * 2 / 3;
enemy[WC_KLINE].deathCounter = -250; enemy[WC_KLINE].deathCounter = -250;
enemy[WC_KLINE].maxShield = 1500; enemy[WC_KLINE].maxShield = 1500;

View File

@ -75,6 +75,18 @@ void addCollectable(float x, float y, int type, int value, int life)
return; return;
} }
// No point in giving the player plasma ammo if the weapons aren't
// upgraded! Give them money instead.
if (type == P_PLASMA_AMMO)
{
if ((weapon[W_PLAYER_WEAPON].reload[0] == rate2reload[currentGame.minPlasmaRate]) &&
(weapon[W_PLAYER_WEAPON].ammo[0] == currentGame.minPlasmaOutput) &&
(weapon[W_PLAYER_WEAPON].damage == currentGame.minPlasmaDamage))
{
type = P_CASH;
}
}
// If the player has a charge cannon or a laser cannon, don't give them // If the player has a charge cannon or a laser cannon, don't give them
// rockets. Causes problems otherwise :) // rockets. Causes problems otherwise :)
if (type == P_ROCKET) if (type == P_ROCKET)