1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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:
Shadooow
2021-06-05 06:08:55 +00:00
parent 4046368bd3
commit 4a2a1c67d2
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/IMP MainPage.cpp
+1 -2
View File
@@ -85,8 +85,7 @@ BOOLEAN IsIMPSlotFree(INT32 iIMPId)
{
if ((iIMPId >= 0) && (iIMPId < NUM_PROFILES) && (iIMPId != NO_PROFILE) &&
( gMercProfiles[iIMPId].Type == PROFILETYPE_IMP ) &&
((wcscmp(gMercProfiles[iIMPId].zName, L"") == 0) ||
(gMercProfiles[iIMPId].bMercStatus == MERC_IS_DEAD) || (gMercProfiles[iIMPId].bMercStatus == MERC_FIRED_AS_A_POW)))
(wcscmp(gMercProfiles[iIMPId].zName, L"") == 0))
{
return TRUE;
}
Strategic/Merc Contract.cpp
+1 -1
View File
@@ -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 );
}