Merged from revision: 7182

Fixes (by Buggler)
- Show map gridno with hotkey 'F' in release build as well for more informative map-related bug reports
- Fixed skipping of bloodcat battles using hotkey 'Esc' in prebattle interface when battle initiated at strategic screen 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7183 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-05-02 13:40:18 +00:00
parent c137c76bb3
commit aef0182ae8
3 changed files with 7 additions and 9 deletions
+5 -7
View File
@@ -3252,11 +3252,9 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
DisplayRangeToTarget( MercPtrs[ gusSelectedSoldier ], usGridNo );
}
#ifdef JA2TESTVERSION
CHAR16 zOutputString[512];
swprintf( zOutputString, L"gridno: %d", usGridNo);
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, zOutputString );
#endif
CHAR16 zOutputString[512];
swprintf( zOutputString, L"%s: %d", pUpdateMapInfoText[19], usGridNo);
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, zOutputString );
}
}
break;
@@ -3265,7 +3263,7 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
if( fCtrl && UsingNewInventorySystem() == true )
{
HandleTBPickUpBackpacks();
}
}
SeperateItems();
if( fCtrl )
StackAndSort( TRUE );
@@ -3327,7 +3325,7 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
if( fCtrl )
{
HandleTBToggleFormation();
}
}
else if ( gGameSettings.fOptions[TOPTION_GL_BURST_CURSOR] )
{
gGameSettings.fOptions[TOPTION_GL_BURST_CURSOR] = FALSE;