From 529a9e798af2075ee75224a24a4231a181844daf Mon Sep 17 00:00:00 2001 From: Wanne Date: Sat, 8 Mar 2014 13:01:50 +0000 Subject: [PATCH] Merged from revision: 7036 - Press 'd' in realtime to activate turn based mode immediately (by Sevenfm) o This only works if enemies are in the sector o You will return to realtime if no enemy contact for 2 turns, as usual o Useful for sneaking in some situations git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7037 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Turn Based Input.cpp | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp index df297d69f..b8198f743 100644 --- a/Tactical/Turn Based Input.cpp +++ b/Tactical/Turn Based Input.cpp @@ -3043,24 +3043,35 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) } } } - } else + } + else { //End turn only if in combat and it is the player's turn if ( fCtrl ) gTacticalStatus.ubDisablePlayerInterrupts = TRUE; + *puiNewEvent = I_ENDTURN; + } } } } - } + #ifdef JA2TESTVERSION else if( fCtrl ) + { AdvanceToNextDay(); + } #endif + // sevenfm: press 'd' in realtime to start turnbased + else + { + if ( (gTacticalStatus.uiFlags & INCOMBAT) || (NumEnemyInSector() != 0) ) + { + EnterCombatMode( OUR_TEAM ); + } + } break; - - case 'e': if( fAlt )