From 586e3dd0d4d7171dc744c9061d5c26c6289f66f5 Mon Sep 17 00:00:00 2001 From: Shadooow Date: Wed, 12 Jan 2022 01:32:32 +0000 Subject: [PATCH] Disabled Spread button in Tactical Placement GUI when hotdropping as the group always appeared together anyway. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9247 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- TileEngine/Tactical Placement GUI.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TileEngine/Tactical Placement GUI.cpp b/TileEngine/Tactical Placement GUI.cpp index 02ad160b4..fb02d6131 100644 --- a/TileEngine/Tactical Placement GUI.cpp +++ b/TileEngine/Tactical Placement GUI.cpp @@ -363,6 +363,7 @@ void InitTacticalPlacementGUI() if ( MercPtrs[ i ]->bTeam == gbPlayerNum && (gGameExternalOptions.ubSkyriderHotLZ == 1 || gGameExternalOptions.ubSkyriderHotLZ == 3) && MercPtrs[ i ]->usSoldierFlagMask & SOLDIER_AIRDROP ) { AddMercToHeli( MercPtrs[ i ]->ubID ); + DisableButton(iTPButtons[SPREAD_BUTTON]); gMercPlacement[ giPlacements ].ubStrategicInsertionCode = INSERTION_CODE_CHOPPER; MercPtrs[ i ]->ubStrategicInsertionCode = INSERTION_CODE_CHOPPER; @@ -1207,7 +1208,7 @@ void TacticalPlacementHandle() if(islocked!=1)GroupPlacementsCallback( ButtonList[ iTPButtons[ GROUP_BUTTON ] ], MSYS_CALLBACK_REASON_LBUTTON_UP ); break; case 's': - if(islocked!=1)SpreadPlacementsCallback( ButtonList[ iTPButtons[ SPREAD_BUTTON ] ], MSYS_CALLBACK_REASON_LBUTTON_UP ); + if(islocked!=1 && ButtonList[iTPButtons[SPREAD_BUTTON]]->uiFlags & BUTTON_ENABLED) SpreadPlacementsCallback( ButtonList[ iTPButtons[ SPREAD_BUTTON ] ], MSYS_CALLBACK_REASON_LBUTTON_UP ); break; case 'x': if( InputEvent.usKeyState & ALT_DOWN )