From 508adc4eee3e85edb30ecc647eb4f8562ac8d239 Mon Sep 17 00:00:00 2001 From: Sevenfm Date: Tue, 29 Mar 2022 18:58:33 +0000 Subject: [PATCH] Show "Select All" line in strategic movement popup box only if we have more than 1 movable squad in sector (by Asdow). git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9351 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/Map Screen Interface.cpp | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/Strategic/Map Screen Interface.cpp b/Strategic/Map Screen Interface.cpp index 03e7bcad..a36582c1 100644 --- a/Strategic/Map Screen Interface.cpp +++ b/Strategic/Map Screen Interface.cpp @@ -3860,8 +3860,11 @@ void AddStringsToMoveBox( void ) AddMonoString(&hStringHandle, L"" ); // add Select all line - swprintf(sString, L"%s", pMovementMenuStrings[4]); - AddMonoString(&hStringHandle, sString); + if (giNumberOfSquadsInSectorMoving > 1) + { + swprintf(sString, L"%s", pMovementMenuStrings[4]); + AddMonoString(&hStringHandle, sString); + } // add squads @@ -4046,13 +4049,16 @@ void BuildMouseRegionsForMoveBox( void ) iCounter++; // Select all line - MSYS_DefineRegion(&gMoveMenuRegion[iCounter], (INT16)(iBoxXPosition), (INT16)(iBoxYPosition + iFontHeight * iCounter), (INT16)(iBoxXPosition + iBoxWidth), (INT16)(iBoxYPosition + iFontHeight * (iCounter + 1)), MSYS_PRIORITY_HIGHEST, - MSYS_NO_CURSOR, MoveMenuMvtCallback, MoveMenuBtnCallback); - // set user defines - MSYS_SetRegionUserData(&gMoveMenuRegion[iCounter], 0, iCounter); - MSYS_SetRegionUserData(&gMoveMenuRegion[iCounter], 1, ALL_SQUADS); - MSYS_SetRegionUserData(&gMoveMenuRegion[iCounter], 2, giNumberOfSquadsInSectorMoving); - iCounter++; + if (giNumberOfSquadsInSectorMoving > 1) + { + MSYS_DefineRegion(&gMoveMenuRegion[iCounter], (INT16)(iBoxXPosition), (INT16)(iBoxYPosition + iFontHeight * iCounter), (INT16)(iBoxXPosition + iBoxWidth), (INT16)(iBoxYPosition + iFontHeight * (iCounter + 1)), MSYS_PRIORITY_HIGHEST, + MSYS_NO_CURSOR, MoveMenuMvtCallback, MoveMenuBtnCallback); + // set user defines + MSYS_SetRegionUserData(&gMoveMenuRegion[iCounter], 0, iCounter); + MSYS_SetRegionUserData(&gMoveMenuRegion[iCounter], 1, ALL_SQUADS); + MSYS_SetRegionUserData(&gMoveMenuRegion[iCounter], 2, giNumberOfSquadsInSectorMoving); + iCounter++; + } // calc total number of "moving" lines in the box iTotalNumberOfLines = giNumberOfSoldiersInSectorMoving + giNumberOfSquadsInSectorMoving + giNumberOfVehiclesInSectorMoving;