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

Fixed shop's min rocket ammo for double/micro missiles.

This commit is contained in:
onpon4 2015-02-28 08:47:26 -05:00
parent 91fa93b448
commit edda015169
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/collectable.cpp
View File

@ -279,7 +279,8 @@ void doCollectables()
break; break;
case P_ROCKET: case P_ROCKET:
limitCharAdd(&player.ammo[1], collectable->value, 0, currentGame.maxRocketAmmo); limitCharAdd(&player.ammo[1], collectable->value, 0,
currentGame.maxRocketAmmo);
if (player.ammo[1] == currentGame.maxRocketAmmo) if (player.ammo[1] == currentGame.maxRocketAmmo)
sprintf(temp, "Rocket Ammo at Maximum"); sprintf(temp, "Rocket Ammo at Maximum");
else else

4
src/shop.cpp
View File

@ -478,14 +478,14 @@ static void buy(int i)
if (player.weaponType[1] == W_DOUBLE_ROCKETS) if (player.weaponType[1] == W_DOUBLE_ROCKETS)
{shopSelectedItem = -8; return;} {shopSelectedItem = -8; return;}
player.weaponType[1] = W_DOUBLE_ROCKETS; player.weaponType[1] = W_DOUBLE_ROCKETS;
limitChar(&currentGame.maxRocketAmmo, 10, 50); limitChar(&currentGame.maxRocketAmmo, 5, 50);
shopSelectedItem = -1; shopSelectedItem = -1;
break; break;
case 11: case 11:
if (player.weaponType[1] == W_MICRO_ROCKETS) if (player.weaponType[1] == W_MICRO_ROCKETS)
{shopSelectedItem = -8; return;} {shopSelectedItem = -8; return;}
player.weaponType[1] = W_MICRO_ROCKETS; player.weaponType[1] = W_MICRO_ROCKETS;
limitChar(&currentGame.maxRocketAmmo, 10, 50); limitChar(&currentGame.maxRocketAmmo, 5, 50);
shopSelectedItem = -1; shopSelectedItem = -1;
break; break;
case 12: case 12: