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

Fixed failure to display proper powerup messages in Classic difficulty.

This commit is contained in:
onpon4 2016-11-26 13:08:53 -05:00
parent f39fa5cbae
commit dd4e0b3855
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/game.cpp
View File

@ -350,6 +350,14 @@ static void game_doCollectables()
weapons[W_PLAYER_WEAPON].reload[0] = MAX( weapons[W_PLAYER_WEAPON].reload[0] = MAX(
rate2reload[game.maxPlasmaRate], rate2reload[game.maxPlasmaRate],
weapons[W_PLAYER_WEAPON].reload[0] - 2); weapons[W_PLAYER_WEAPON].reload[0] - 2);
if (weapons[W_PLAYER_WEAPON].reload[0] <= rate2reload[game.maxPlasmaRate])
sprintf(temp, "Firing rate already at maximum");
else
{
weapons[W_PLAYER_WEAPON].reload[0] -= 2;
sprintf(temp, "Firing rate increased");
}
} }
else if ((game.area != MISN_INTERCEPTION) || else if ((game.area != MISN_INTERCEPTION) ||
(player.ammo[0] > 0)) (player.ammo[0] > 0))
@ -379,6 +387,14 @@ static void game_doCollectables()
player.ammo[0] = MAX(player.ammo[0], 50); player.ammo[0] = MAX(player.ammo[0], 50);
weapons[W_PLAYER_WEAPON].ammo[0] = MIN( weapons[W_PLAYER_WEAPON].ammo[0] = MIN(
game.maxPlasmaOutput, weapons[W_PLAYER_WEAPON].ammo[0] + 1); game.maxPlasmaOutput, weapons[W_PLAYER_WEAPON].ammo[0] + 1);
if (weapons[W_PLAYER_WEAPON].ammo[0] >= game.maxPlasmaOutput)
sprintf(temp, "Plasma output already at maximum");
else
{
weapons[W_PLAYER_WEAPON].ammo[0]++;
sprintf(temp, "Plasma output increased");
}
} }
else if ((game.area != MISN_INTERCEPTION) || else if ((game.area != MISN_INTERCEPTION) ||
(player.ammo[0] > 0)) (player.ammo[0] > 0))
@ -408,6 +424,14 @@ static void game_doCollectables()
player.ammo[0] = MAX(player.ammo[0], 50); player.ammo[0] = MAX(player.ammo[0], 50);
weapons[W_PLAYER_WEAPON].damage = MIN( weapons[W_PLAYER_WEAPON].damage = MIN(
game.maxPlasmaDamage, weapons[W_PLAYER_WEAPON].damage + 1); game.maxPlasmaDamage, weapons[W_PLAYER_WEAPON].damage + 1);
if (weapons[W_PLAYER_WEAPON].damage >= game.maxPlasmaDamage)
sprintf(temp, "Plasma damage already at maximum");
else
{
weapons[W_PLAYER_WEAPON].damage++;
sprintf(temp, "Plasma damage increased");
}
} }
else if ((game.area != MISN_INTERCEPTION) || else if ((game.area != MISN_INTERCEPTION) ||
(player.ammo[0] > 0)) (player.ammo[0] > 0))