From d3f5d3d9b06c091156e7d37bfc1039ebd38b0ea1 Mon Sep 17 00:00:00 2001 From: Flugente Date: Mon, 4 Nov 2013 18:25:31 +0000 Subject: [PATCH] If USE_AIMED_BURST and AIMED_BURST_ALTERNATE_KEY are TRUE, then [Alt] + [t] over a target will toggle aiming. This is for people who have no working mousewheel and thus couldn't aim with auto-only weapons. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6555 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameSettings.cpp | 5 +++-- GameSettings.h | 3 ++- Tactical/Turn Based Input.cpp | 12 +++++++++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/GameSettings.cpp b/GameSettings.cpp index 3446acc9c..36f1ce5c9 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -1321,8 +1321,9 @@ void LoadGameExternalOptions() // Use aimed burst gGameExternalOptions.bAimedBurstEnabled = iniReader.ReadBoolean("Tactical Interface Settings","USE_AIMED_BURST",FALSE); - - // Penalcy for aimed burst + gGameExternalOptions.bAimedBurstAlternateKey = iniReader.ReadBoolean("Tactical Interface Settings","AIMED_BURST_ALTERNATE_KEY",FALSE); + + // Penalty for aimed burst gGameExternalOptions.uAimedBurstPenalty = iniReader.ReadInteger("Tactical Interface Settings","AIMING_BURST_PENALTY",2, 0, 10); // We could see all what can see militia diff --git a/GameSettings.h b/GameSettings.h index cb989f72e..6ebb72bad 100644 --- a/GameSettings.h +++ b/GameSettings.h @@ -785,7 +785,8 @@ typedef struct INT32 uStaminaHit; //enable ext mouse key BOOLEAN bAltAimEnabled; - BOOLEAN bAimedBurstEnabled; + BOOLEAN bAimedBurstEnabled; + BOOLEAN bAimedBurstAlternateKey; // Flugente: some users cannot use the mousewheel and are thus unable to aim auto-only weapons. This solves this by allowing to aim via a key command INT16 uAimedBurstPenalty; BOOLEAN bWeSeeWhatMilitiaSeesAndViceVersa; BOOLEAN bAllowWearSuppressor; diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp index 5d410d700..f8a38bc12 100644 --- a/Tactical/Turn Based Input.cpp +++ b/Tactical/Turn Based Input.cpp @@ -4296,7 +4296,17 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) if( fAlt ) { - if ( CHEATER_CHEAT_LEVEL( ) ) + // Flugente: alternate for people without mousewheel who want to aim auto-only weapons + if ( gGameExternalOptions.bAimedBurstEnabled && gGameExternalOptions.bAimedBurstAlternateKey && gCurrentUIMode == CONFIRM_ACTION_MODE ) + { + SOLDIERTYPE * pSoldier; + + if ( GetSoldier( &pSoldier, gusSelectedSoldier ) ) + { + HandleRightClickAdjustCursor( pSoldier, usMapPos ); + } + } + else if ( CHEATER_CHEAT_LEVEL( ) ) { TeleportSelectedSoldier(); }