mirror of
https://github.com/1dot13/source.git
synced 2026-08-05 14:00:23 +02:00
- Fix: cleaning weapons prompt read parameters wrong
- when a merc regains HP via surgery, display the gain - if an EPC leaves the team, add them to the list of departed characters git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7977 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -4975,7 +4975,7 @@ void CleanWeapons( BOOLEAN fEntireTeam )
|
||||
return;
|
||||
|
||||
// if in combat, always only for selected merc
|
||||
if ( !fEntireTeam || (gTacticalStatus.uiFlags & INCOMBAT) )
|
||||
if ( !fEntireTeam )
|
||||
{
|
||||
if ( gusSelectedSoldier == NOBODY )
|
||||
return;
|
||||
@@ -4987,7 +4987,7 @@ void CleanWeapons( BOOLEAN fEntireTeam )
|
||||
}
|
||||
else // perform action for every merc in this sector
|
||||
{
|
||||
UINT8 bMercID, bLastTeamID;
|
||||
UINT16 bMercID, bLastTeamID;
|
||||
SOLDIERTYPE* pSoldier = NULL;
|
||||
|
||||
bMercID = gTacticalStatus.Team[ gbPlayerNum ].bFirstID;
|
||||
@@ -5326,7 +5326,7 @@ void TacticalFunctionSelectionMessageBoxCallBack( UINT8 ubExitValue )
|
||||
break;
|
||||
case 3:
|
||||
// clean weapons - in realtime of the entire team, in turnbased only for the selected merc
|
||||
CleanWeapons( gTacticalStatus.uiFlags & INCOMBAT );
|
||||
CleanWeapons( !(gTacticalStatus.uiFlags & INCOMBAT) );
|
||||
break;
|
||||
case 4:
|
||||
UpdateGear();
|
||||
|
||||
Reference in New Issue
Block a user