From edda015169e4f26621b10be8c19e9fa7baf109e2 Mon Sep 17 00:00:00 2001 From: onpon4 Date: Sat, 28 Feb 2015 08:47:26 -0500 Subject: [PATCH] Fixed shop's min rocket ammo for double/micro missiles. --- src/collectable.cpp | 3 ++- src/shop.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/collectable.cpp b/src/collectable.cpp index 38e7ca7..64337ef 100644 --- a/src/collectable.cpp +++ b/src/collectable.cpp @@ -279,7 +279,8 @@ void doCollectables() break; 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) sprintf(temp, "Rocket Ammo at Maximum"); else diff --git a/src/shop.cpp b/src/shop.cpp index ca94146..99be3d2 100644 --- a/src/shop.cpp +++ b/src/shop.cpp @@ -478,14 +478,14 @@ static void buy(int i) if (player.weaponType[1] == W_DOUBLE_ROCKETS) {shopSelectedItem = -8; return;} player.weaponType[1] = W_DOUBLE_ROCKETS; - limitChar(¤tGame.maxRocketAmmo, 10, 50); + limitChar(¤tGame.maxRocketAmmo, 5, 50); shopSelectedItem = -1; break; case 11: if (player.weaponType[1] == W_MICRO_ROCKETS) {shopSelectedItem = -8; return;} player.weaponType[1] = W_MICRO_ROCKETS; - limitChar(¤tGame.maxRocketAmmo, 10, 50); + limitChar(¤tGame.maxRocketAmmo, 5, 50); shopSelectedItem = -1; break; case 12: