minor fixes and clarity

Author: MjnMixael

code/mission/missionparse.cpp

@@ -1291,7 +1291,9 @@ void parse_player_info2(mission *pm)
 			support_rearm_list.clear();
 			stuff_loadout_list(support_rearm_list, ParseLookupType::MISSION_LOADOUT_WEAPON_LIST);
 
-			if (!pm->support_ships.rearm_pool_from_loadout) {
+			if (pm->support_ships.rearm_pool_from_loadout) {
+				WarningEx(LOCATION, "+Support Rearm Pool is set but +Support Rearm Pool From Loadout is also enabled! The explicit pool will be ignored.\n");
+			} else {
 				for (auto& wc : support_rearm_list) {
 					if (wc.index < 0 || wc.index >= weapon_info_size()) {
 						continue;
@@ -1308,6 +1310,8 @@ void parse_player_info2(mission *pm)
 						pm->support_ships.rearm_weapon_pool[nt][wc.index] = 0;
 					} else if (wc.count < 0) {
 						pm->support_ships.rearm_weapon_pool[nt][wc.index] = -1;
+					} else if (wc.count == 0) {
+						pm->support_ships.rearm_weapon_pool[nt][wc.index] = 0;
 					} else if (wc.count > 0 && pm->support_ships.rearm_weapon_pool[nt][wc.index] >= 0) {
 						pm->support_ships.rearm_weapon_pool[nt][wc.index] += wc.count;
 					}

code/ship/ship.cpp

@@ -16427,13 +16427,12 @@ int ship_do_rearm_frame( object *objp, float frametime )
 						if (objp == Player_obj)
 							joy_ff_play_reload_effect();
 
+						const int prev_ammo = swp->secondary_bank_ammo[i];
 						swp->secondary_bank_ammo[i] += reload_amount;
-						use_mission_rearm_pool_for_weapon(weapon_class, reload_amount, shipp->team);
 						if (swp->secondary_bank_ammo[i] > swp->secondary_bank_start_ammo[i]) {
 							swp->secondary_bank_ammo[i] = swp->secondary_bank_start_ammo[i];
 						}
-					} else {
-					}
+						use_mission_rearm_pool_for_weapon(weapon_class, swp->secondary_bank_ammo[i] - prev_ammo, shipp->team);
 				} else {
 					banks_full++;
 				}
@@ -16518,11 +16517,12 @@ int ship_do_rearm_frame( object *objp, float frametime )
 							if (sound_index.isValid())
 								snd_play_3d(gamesnd_get_game_sound(sound_index), &objp->pos, &View_position);
 
+							const int prev_primary_ammo = swp->primary_bank_ammo[i];
 							swp->primary_bank_ammo[i] += reload_amount;
-							use_mission_rearm_pool_for_weapon(weapon_class, reload_amount, shipp->team);
 							if (swp->primary_bank_ammo[i] > swp->primary_bank_start_ammo[i]) {
 								swp->primary_bank_ammo[i] = swp->primary_bank_start_ammo[i];
 							}
+							use_mission_rearm_pool_for_weapon(weapon_class, swp->primary_bank_ammo[i] - prev_primary_ammo, shipp->team);
 						}
 					} else {
 						primary_banks_full++;