mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
better way of handling IMP slot replacements, game will no longer replace dead merc that was not deleted from team - so his name and stats will stay intact in personnel page
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9063 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -1074,7 +1074,7 @@ BOOLEAN StrategicRemoveMerc( SOLDIERTYPE *pSoldier )
|
||||
|
||||
// WDS: This allows for replacing dead IMP mercs. See "BtnIMPBeginScreenDoneCallback" in "IMP Begin Screen.cpp"
|
||||
if( ( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__PLAYER_CHARACTER ) &&
|
||||
( gMercProfiles[ pSoldier->ubProfile ].bMercStatus == MERC_IS_DEAD ) ) {
|
||||
(( gMercProfiles[ pSoldier->ubProfile ].bMercStatus == MERC_IS_DEAD ) || (gMercProfiles[pSoldier->ubProfile].bMercStatus == MERC_FIRED_AS_A_POW))) {
|
||||
// Replace the name with an empty string
|
||||
wcsncpy( gMercProfiles[ pSoldier->ubProfile ].zName, L"", 1 );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user