walkero
/
tbftss
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Prevent player from moving if system power <= 0.

This commit is contained in:
Steve 2016-05-08 19:00:14 +01:00
parent 86e0443067
commit f51557f801
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/battle/player.c
View File

@ -93,7 +93,7 @@ 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) if (player->alive == ALIVE_ALIVE && player->systemPower > 0)
{ {
self = player; self = player;
@ -142,16 +142,6 @@ void doPlayer(void)
initPlayerSelect(); initPlayerSelect();
} }
} }
/* really only used in challenge mode */
if (player->systemPower <= 0 && battle.status == MS_IN_PROGRESS)
{
if (game.currentMission->challengeData.isChallenge)
{
addHudMessage(colors.red, _("Challenge Failed!"));
failMission();
}
}
if (battle.status == MS_IN_PROGRESS) if (battle.status == MS_IN_PROGRESS)
{ {
@ -163,6 +153,16 @@ void doPlayer(void)
player->missiles = 999; player->missiles = 999;
} }
} }
/* really only used in challenge mode */
if (player->systemPower <= 0 && battle.status == MS_IN_PROGRESS)
{
if (game.currentMission->challengeData.isChallenge)
{
addHudMessage(colors.red, _("Challenge Failed!"));
failMission();
}
}
if (battle.boostTimer == (int)BOOST_FINISHED_TIME) if (battle.boostTimer == (int)BOOST_FINISHED_TIME)
{ {