Restrict controls when player is dead or disabled.

This commit is contained in:
Steve 2016-05-10 10:03:17 +01:00
parent 09ecd97f29
commit 6dcbd265d9
1 changed files with 43 additions and 46 deletions

View File

@ -93,8 +93,6 @@ void doPlayer(void)
battle.boostTimer = MIN(battle.boostTimer + 1, BOOST_RECHARGE_TIME); battle.boostTimer = MIN(battle.boostTimer + 1, BOOST_RECHARGE_TIME);
battle.ecmTimer = MIN(battle.ecmTimer + 1, ECM_RECHARGE_TIME); battle.ecmTimer = MIN(battle.ecmTimer + 1, ECM_RECHARGE_TIME);
if (player->alive == ALIVE_ALIVE && player->systemPower > 0)
{
self = player; self = player;
if (game.currentMission->challengeData.isChallenge) if (game.currentMission->challengeData.isChallenge)
@ -102,7 +100,7 @@ void doPlayer(void)
applyRestrictions(); applyRestrictions();
} }
if (player->alive == ALIVE_ALIVE) if (player->alive == ALIVE_ALIVE && player->systemPower > 0)
{ {
handleKeyboard(); handleKeyboard();
@ -152,7 +150,6 @@ void doPlayer(void)
{ {
player->missiles = 999; player->missiles = 999;
} }
}
/* really only used in challenge mode */ /* really only used in challenge mode */
if (player->systemPower <= 0 && battle.status == MS_IN_PROGRESS) if (player->systemPower <= 0 && battle.status == MS_IN_PROGRESS)