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

Fix NOTIFY_IF_SLEEP_FAILS for multiple mercs selected

Browse Source
This commit is contained in:
Marco Antonio J. Costa
2025-08-12 23:18:49 -03:00
committed by majcosta
parent 9ff8476c15
commit 616d9a08e6
1 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Assignments.cpp
+13 -20
View File
@@ -18251,7 +18251,6 @@ BOOLEAN HandleSelectedMercsBeingPutAsleep( BOOLEAN fWakeUp, BOOLEAN fDisplayWarn
INT32 iCounter = 0;
SOLDIERTYPE *pSoldier = NULL;
UINT8 ubNumberOfSelectedSoldiers = 0;
CHAR16 sString[ 128 ];
for( iCounter = 0; iCounter < giMAXIMUM_NUMBER_OF_PLAYER_SLOTS; ++iCounter )
{
@@ -18306,27 +18305,21 @@ BOOLEAN HandleSelectedMercsBeingPutAsleep( BOOLEAN fWakeUp, BOOLEAN fDisplayWarn
}
}
// if there was anyone processed, check for success and inform player of failure
if( ubNumberOfSelectedSoldiers )
if( ubNumberOfSelectedSoldiers == 0 )
{
if( fSuccess == FALSE )
{
if( fWakeUp )
{
// inform player not everyone could be woke up
swprintf( sString, pMapErrorString[ 27 ] );
}
else
{
// inform player not everyone could be put to sleep
swprintf( sString, pMapErrorString[ 26 ]);
}
return fSuccess;
}
if( fDisplayWarning )
{
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL);
}
}
if( !fDisplayWarning ) {
return fSuccess;
}
CHAR16 sString[ 128 ];
swprintf( sString, fWakeUp ? pMapErrorString[ 27 ] : pMapErrorString[ 26 ] );
if( gGameExternalOptions.fSleepDisplayFailNotification )
{
// inform player not everyone could be woke up or put to sleep
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL);
}
return( fSuccess );