1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- New Shortcuts (by Buggler)

Browse Source 
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:
Wanne
2011-09-12 17:44:05 +00:00
parent 1687c148f9
commit 9e40cee476
13 changed files with 116 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Map Screen Interface Map Inventory.h
+1
View File
@@ -50,6 +50,7 @@ extern INT32 iCurrentlyHighLightedItem;
extern BOOLEAN fFlashHighLightInventoryItemOnradarMap;
extern INT32 sObjectSourceGridNo;
extern INT32 iCurrentInventoryPoolPage;
extern INT32 iLastInventoryPoolPage;
extern BOOLEAN fMapInventoryItemCompatable[ ];
extern INT32 MAP_INVENTORY_POOL_SLOT_COUNT;
Strategic/mapscreen.cpp
+42
View File
@@ -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 )
Tactical/Interface Items.cpp
+2
View File
@@ -7352,6 +7352,8 @@ void DeleteItemStackPopup( )
fInterfacePanelDirty = DIRTYLEVEL2;
fMapScreenBottomDirty = TRUE;
//guiTacticalInterfaceFlags &= (~INTERFACE_NORENDERBUTTONS);
// if ( !(guiTacticalInterfaceFlags & INTERFACE_MAPSCREEN ) )
Utils/Text.h
+1
View File
@@ -145,6 +145,7 @@ extern STR16 pMapScreenFastHelpTextList[];
extern STR16 pMovementMenuStrings[];
extern STR16 pUpdateMercStrings[];
extern STR16 pMapScreenBorderButtonHelpText[];
extern STR16 pMapScreenInvenButtonHelpText[];
extern STR16 pMapScreenBottomFastHelp[];
extern STR16 pMapScreenBottomText[];
extern STR16 pMercDeadString[];
Utils/_ChineseText.cpp
+8 -2
View File
@@ -3048,9 +3048,15 @@ STR16 pMapScreenBorderButtonHelpText[] =
L"显示领空 (|A)",
L"显示物品 (|I)",
L"显示民兵和敌人 (|Z)",
L"显示民兵移动", // HEADROCK HAM 4: Mobile Restrictions Button
L"显示民兵移动 (|R)", // HEADROCK HAM 4: Mobile Restrictions Button
};
STR16 pMapScreenInvenButtonHelpText[] =
{
L"Next (|.)", // next page // TODO.Translate
L"Previous (|,)", // previous page // TODO.Translate
L"Exit Sector Inventory (|E|s|c)", // exit sector inventory // TODO.Translate
};
STR16 pMapScreenBottomFastHelp[] =
{
@@ -4239,7 +4245,7 @@ STR16 BobbyRFilter[] =
// Misc
L"刀具", //"Blades",
L"飞刀", //"Th. Knives",
L"格斗武器", //"Punch. W.",
L"格斗武器", //"Blunt W.", // TODO.Translate
L"手雷/榴弹", //"Grenades",
L"炸药", //"Bombs",
L"医疗用品", //"Med. Kits",
Utils/_DutchText.cpp
+8 -2
View File
@@ -3046,9 +3046,15 @@ STR16 pMapScreenBorderButtonHelpText[] =
L"Toon Luchtruim (|A)",
L"Toon |Items",
L"Toon Milities & Vijanden (|Z)",
L"Show Mobile Militia Restrictions", // HEADROCK HAM 4: Mobile Restrictions Button
L"Show Mobile Militia |Restrictions", // HEADROCK HAM 4: Mobile Restrictions Button // TODO.Translate
};
STR16 pMapScreenInvenButtonHelpText[] =
{
L"Next (|.)", // next page // TODO.Translate
L"Previous (|,)", // previous page // TODO.Translate
L"Exit Sector Inventory (|E|s|c)", // exit sector inventory // TODO.Translate
};
STR16 pMapScreenBottomFastHelp[] =
{
@@ -4236,7 +4242,7 @@ STR16 BobbyRFilter[] =
// Misc
L"Blades",
L"Th. Knives",
L"Punch. W.",
L"Blunt W.",
L"Grenades",
L"Bombs",
L"Med. Kits",
Utils/_EnglishText.cpp
+8 -2
View File
@@ -3049,9 +3049,15 @@ STR16 pMapScreenBorderButtonHelpText[] =
L"Show |Airspace",
L"Show |Items",
L"Show Militia & Enemies (|Z)",
L"Show Mobile Militia Restrictions", // HEADROCK HAM 4: Mobile Restrictions Button
L"Show Mobile Militia |Restrictions", // HEADROCK HAM 4: Mobile Restrictions Button
};
STR16 pMapScreenInvenButtonHelpText[] =
{
L"Next (|.)", // next page
L"Previous (|,)", // previous page
L"Exit Sector Inventory (|E|s|c)", // exit sector inventory
};
STR16 pMapScreenBottomFastHelp[] =
{
@@ -4240,7 +4246,7 @@ STR16 BobbyRFilter[] =
// Misc
L"Blades",
L"Th. Knives",
L"Punch. W.",
L"Blunt W.",
L"Grenades",
L"Bombs",
L"Med. Kits",
Utils/_FrenchText.cpp
+7 -1
View File
@@ -3049,9 +3049,15 @@ STR16 pMapScreenBorderButtonHelpText[] =
L"Espace aérien (|A)",
L"Objets (|I)",
L"Milice & Ennemis (|Z)",
L"Show Mobile Militia Restrictions", // HEADROCK HAM 4: Mobile Restrictions Button
L"Show Mobile Militia |Restrictions", // HEADROCK HAM 4: Mobile Restrictions Button // TODO.Translate
};
STR16 pMapScreenInvenButtonHelpText[] =
{
L"Next (|.)", // next page // TODO.Translate
L"Previous (|,)", // previous page // TODO.Translate
L"Exit Sector Inventory (|E|s|c)", // exit sector inventory // TODO.Translate
};
STR16 pMapScreenBottomFastHelp[] =
{
Utils/_GermanText.cpp
+8 -1
View File
@@ -3036,7 +3036,14 @@ STR16 pMapScreenBorderButtonHelpText[] =
L"Luftr|aum zeigen",
L"Gegenstände zeigen (|I)",
L"Mili|z & Feinde zeigen",
L"Zeige Mobile Miliz Begrenzungen", // HEADROCK HAM 4: Mobile Restrictions Button
L"Zeige Mobile Miliz Begrenzungen (|R)", // HEADROCK HAM 4: Mobile Restrictions Button
};
STR16 pMapScreenInvenButtonHelpText[] =
{
L"^Nächste (|.)", // next page
L"Vorherige (|,)", // previous page
L"Sektor Inventar schließen (|E|s|c)", // exit sector inventory
};
STR16 pMapScreenBottomFastHelp[] =
Utils/_ItalianText.cpp
+8 -2
View File
@@ -3042,9 +3042,15 @@ STR16 pMapScreenBorderButtonHelpText[] =
L"Mostra spazio |aereo",
L"Mostra oggett|i",
L"Mostra esercito & nemici (|Z)",
L"Show Mobile Militia Restrictions", // HEADROCK HAM 4: Mobile Restrictions Button
L"Show Mobile Militia |Restrictions", // HEADROCK HAM 4: Mobile Restrictions Button // TODO.Translate
};
STR16 pMapScreenInvenButtonHelpText[] =
{
L"Next (|.)", // next page // TODO.Translate
L"Previous (|,)", // previous page // TODO.Translate
L"Exit Sector Inventory (|E|s|c)", // exit sector inventory // TODO.Translate
};
STR16 pMapScreenBottomFastHelp[] =
{
@@ -4231,7 +4237,7 @@ STR16 BobbyRFilter[] =
// Misc
L"Blades",
L"Th. Knives",
L"Punch. W.",
L"Blunt W.",
L"Grenades",
L"Bombs",
L"Med. Kits",
Utils/_PolishText.cpp
+8 -2
View File
@@ -3049,9 +3049,15 @@ STR16 pMapScreenBorderButtonHelpText[] =
L"Pokaż przestrzeń powietrznš (|A)",
L"Pokaż przedmioty (|I)",
L"Pokaż samoobronę i wrogów (|Z)",
L"Show Mobile Militia Restrictions", // HEADROCK HAM 4: Mobile Restrictions Button
L"Show Mobile Militia |Restrictions", // HEADROCK HAM 4: Mobile Restrictions Button // TODO.Translate
};
STR16 pMapScreenInvenButtonHelpText[] =
{
L"Next (|.)", // next page // TODO.Translate
L"Previous (|,)", // previous page // TODO.Translate
L"Exit Sector Inventory (|E|s|c)", // exit sector inventory // TODO.Translate
};
STR16 pMapScreenBottomFastHelp[] =
{
@@ -4239,7 +4245,7 @@ STR16 BobbyRFilter[] =
// Misc
L"Ostrza",
L"Noże do rzucania",
L"Punch. W.",
L"Blunt W.", // TODO.Translate
L"Granaty",
L"Bomby",
L"Apteczki",
Utils/_RussianText.cpp
+7 -1
View File
@@ -3048,9 +3048,15 @@ STR16 pMapScreenBorderButtonHelpText[] =
L"Карта воздушного пространства (|A)",
L"Вещи (|I)",
L"Ополчение и враги (|Z)",
L"Мобильные группы ополченцев", //HAM 4: Show Mobile Militia Restrictions
L"Мобильные группы ополченцев (|R)", //HAM 4: Show Mobile Militia Restrictions
};
STR16 pMapScreenInvenButtonHelpText[] =
{
L"Next (|.)", // next page // TODO.Translate
L"Previous (|,)", // previous page // TODO.Translate
L"Exit Sector Inventory (|E|s|c)", // exit sector inventory // TODO.Translate
};
STR16 pMapScreenBottomFastHelp[] =
{
Utils/_TaiwaneseText.cpp
+8 -2
View File
@@ -3050,9 +3050,15 @@ STR16 pMapScreenBorderButtonHelpText[] =
L"Show |Airspace",
L"Show |Items",
L"Show Militia & Enemies (|Z)",
L"Show Mobile Militia Restrictions", // HEADROCK HAM 4: Mobile Restrictions Button
L"Show Mobile Militia |Restrictions", // HEADROCK HAM 4: Mobile Restrictions Button
};
STR16 pMapScreenInvenButtonHelpText[] =
{
L"Next (|.)", // next page
L"Previous (|,)", // previous page
L"Exit Sector Inventory (|E|s|c)", // exit sector inventory
};
STR16 pMapScreenBottomFastHelp[] =
{
@@ -4241,7 +4247,7 @@ STR16 BobbyRFilter[] =
// Misc
L"Blades",
L"Th. Knives",
L"Punch. W.",
L"Blunt W.",
L"Grenades",
L"Bombs",
L"Med. Kits",