Skip to content

Fix NOTIFY_IF_SLEEP_FAILS for multiple mercs selected #481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
majcosta merged 1 commit into from
Aug 13, 2025
Merged

Fix NOTIFY_IF_SLEEP_FAILS for multiple mercs selected #481

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 13 additions & 20 deletions Strategic/Assignments.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
{
Expand Down Expand Up @@ -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 );
Expand Down