mirror of
https://github.com/1dot13/source.git
synced 2026-08-05 14:00:23 +02:00
- New Shortcuts (by Buggler)
New Hotkeys o Strategic Screen: Hotkey 'r': Mobile Milita Restrictions o Sector Inventory (with popup text): Hotkey ',': Previous Page Hotkey '.': Next Page Hotkey 'Esc': Exit Sector Inventory o Addtional Changes: Bobby Ray's button text 'Punch. W.' changed to 'Blunt W.' - more appropriate & consistent with XML Item Class name o Cosmetic Corrections in Sector Inventory git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4647 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -6850,6 +6850,14 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
|
||||
DeleteKeyRingPopup( );
|
||||
fTeamPanelDirty = TRUE;
|
||||
}
|
||||
else if( fShowMapInventoryPool == TRUE )
|
||||
{
|
||||
// no item on cursor & not in either stack popup
|
||||
if( gMPanelRegion.Cursor != EXTERN_CURSOR && !InSectorStackPopup() && !InItemStackPopup() )
|
||||
{
|
||||
fShowMapInventoryPool = FALSE;
|
||||
}
|
||||
}
|
||||
else if( fShowInventoryFlag == TRUE )
|
||||
{
|
||||
if ( gMPanelRegion.Cursor != EXTERN_CURSOR && !InItemStackPopup() )
|
||||
@@ -7122,6 +7130,30 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
|
||||
#endif
|
||||
break;
|
||||
|
||||
case ',':
|
||||
if( fShowMapInventoryPool == TRUE )
|
||||
{
|
||||
// if can go to previous page, go there
|
||||
if( iCurrentInventoryPoolPage > 0 )
|
||||
{
|
||||
iCurrentInventoryPoolPage--;
|
||||
fMapPanelDirty = TRUE;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case '.':
|
||||
if( fShowMapInventoryPool == TRUE )
|
||||
{
|
||||
// if can go to next page, go there
|
||||
if( iCurrentInventoryPoolPage < ( iLastInventoryPoolPage ) )
|
||||
{
|
||||
iCurrentInventoryPoolPage++;
|
||||
fMapPanelDirty = TRUE;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case '/':
|
||||
#ifdef JA2TESTVERSION
|
||||
if( fAlt )
|
||||
@@ -7686,6 +7718,16 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
|
||||
{ //activate autoresolve in prebattle interface.
|
||||
ActivatePreBattleRetreatAction();
|
||||
}
|
||||
// WANNE: Only allow when mobile militia is allowed!
|
||||
else if (gGameExternalOptions.gfAllowMilitiaGroups)
|
||||
{
|
||||
// only handle border button keyboard equivalents if the button is visible!
|
||||
if ( !fShowMapInventoryPool )
|
||||
{
|
||||
// toggle show mobile restrictions filter
|
||||
ToggleMobileFilter();
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 's':
|
||||
if( fAlt )
|
||||
|
||||
Reference in New Issue
Block a user