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

Actually fix NOTIFY_IF_SLEEP_FAILS for multiple mercs selected

Browse Source
This commit is contained in:
Marco Antonio J. Costa
2025-08-24 07:39:00 -03:00
committed by majcosta
parent ed00830202
commit 3c44f133fd
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Assignments.cpp
+2 -13
View File
@@ -18305,21 +18305,10 @@ BOOLEAN HandleSelectedMercsBeingPutAsleep( BOOLEAN fWakeUp, BOOLEAN fDisplayWarn
} }
} }
if( ubNumberOfSelectedSoldiers == 0 ) if( ubNumberOfSelectedSoldiers && !fSuccess && fDisplayWarning )
{
return fSuccess;
}
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 // 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 ); return( fSuccess );
Strategic/mapscreen.cpp
+3 -3
View File
@@ -11897,12 +11897,12 @@ void TeamListSleepRegionBtnCallBack( MOUSE_REGION *pRegion, INT32 iReason )
if( pSoldier->flags.fMercAsleep == TRUE ) if( pSoldier->flags.fMercAsleep == TRUE )
{ {
// try to wake him up // 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 // HEADROCK HAM B2.8: New feature wakes all trainees/trainers automatically
HandleTrainingWakeSynchronize( pSoldier ); HandleTrainingWakeSynchronize( pSoldier );
// propagate // propagate
HandleSelectedMercsBeingPutAsleep( TRUE, TRUE ); HandleSelectedMercsBeingPutAsleep( TRUE, gGameExternalOptions.fSleepDisplayFailNotification);
return; return;
} }
else else
@@ -11919,7 +11919,7 @@ void TeamListSleepRegionBtnCallBack( MOUSE_REGION *pRegion, INT32 iReason )
// HEADROCK HAM B2.8: New feature sends all trainees/trainers to sleep automatically // HEADROCK HAM B2.8: New feature sends all trainees/trainers to sleep automatically
HandleTrainingSleepSynchronize( pSoldier ); HandleTrainingSleepSynchronize( pSoldier );
// propagate // propagate
HandleSelectedMercsBeingPutAsleep( FALSE, TRUE ); HandleSelectedMercsBeingPutAsleep( FALSE, gGameExternalOptions.fSleepDisplayFailNotification);
return; return;
} }
else else