mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Merged from revision: 7287
Fixes (by Buggler) - Disabled calling reinforcements from patrol groups when queen wakes up as they will not be replenished (thanks anv) - Fixed queen reinforcement pool being replenished on depletion when playing with limited enemy troops setting - Alternative hotkey ~ (tilde) to toggle merc inventory in strategic screen like in tactical screen git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7288 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -7202,8 +7202,11 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
|
||||
break;
|
||||
|
||||
case '`':
|
||||
if (fAlt)
|
||||
{
|
||||
}
|
||||
#ifdef JA2TESTVERSION
|
||||
if( fCtrl )
|
||||
else if( fCtrl )
|
||||
{
|
||||
if( bSelectedInfoChar != -1 )
|
||||
{
|
||||
@@ -7211,11 +7214,8 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
|
||||
}
|
||||
}
|
||||
#endif
|
||||
if (fAlt)
|
||||
{
|
||||
|
||||
break;
|
||||
}
|
||||
else
|
||||
RequestToggleMercInventoryPanel();
|
||||
break;
|
||||
|
||||
case '\\':
|
||||
|
||||
Reference in New Issue
Block a user