Skip to content

Actually fix NOTIFY_IF_SLEEP_FAILS for multiple mercs selected #490

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 24, 2025
Merged

Actually fix NOTIFY_IF_SLEEP_FAILS for multiple mercs selected #490

Show file tree
Hide file tree
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
15 changes: 2 additions & 13 deletions Strategic/Assignments.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18305,21 +18305,10 @@ BOOLEAN HandleSelectedMercsBeingPutAsleep( BOOLEAN fWakeUp, BOOLEAN fDisplayWarn
}
}

if( ubNumberOfSelectedSoldiers == 0 )
{
return fSuccess;
}

if( !fDisplayWarning ) {
return fSuccess;
}

CHAR16 sString[ 128 ];
swprintf( sString, fWakeUp ? pMapErrorString[ 27 ] : pMapErrorString[ 26 ] );
if( gGameExternalOptions.fSleepDisplayFailNotification )
if( ubNumberOfSelectedSoldiers && !fSuccess && fDisplayWarning )
{
// inform player not everyone could be woke up or put to sleep
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL);
DoScreenIndependantMessageBox(fWakeUp ? pMapErrorString[27] : pMapErrorString[26], MSG_BOX_FLAG_OK, NULL);
}

return( fSuccess );
Expand Down
6 changes: 3 additions & 3 deletions Strategic/mapscreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11897,12 +11897,12 @@ void TeamListSleepRegionBtnCallBack( MOUSE_REGION *pRegion, INT32 iReason )
if( pSoldier->flags.fMercAsleep == TRUE )
{
// try to wake him up
if( SetMercAwake( pSoldier, TRUE, FALSE ) )
if( SetMercAwake( pSoldier, gGameExternalOptions.fSleepDisplayFailNotification, FALSE ) )
{
// HEADROCK HAM B2.8: New feature wakes all trainees/trainers automatically
HandleTrainingWakeSynchronize( pSoldier );
// propagate
HandleSelectedMercsBeingPutAsleep( TRUE, TRUE );
HandleSelectedMercsBeingPutAsleep( TRUE, gGameExternalOptions.fSleepDisplayFailNotification);
return;
}
else
Expand All @@ -11919,7 +11919,7 @@ void TeamListSleepRegionBtnCallBack( MOUSE_REGION *pRegion, INT32 iReason )
// HEADROCK HAM B2.8: New feature sends all trainees/trainers to sleep automatically
HandleTrainingSleepSynchronize( pSoldier );
// propagate
HandleSelectedMercsBeingPutAsleep( FALSE, TRUE );
HandleSelectedMercsBeingPutAsleep( FALSE, gGameExternalOptions.fSleepDisplayFailNotification);
return;
}
else
Expand Down