diff --git a/Strategic/Map Screen Interface Map Inventory.h b/Strategic/Map Screen Interface Map Inventory.h index 2d407c641..34644e77a 100644 --- a/Strategic/Map Screen Interface Map Inventory.h +++ b/Strategic/Map Screen Interface Map Inventory.h @@ -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; diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp index 52d80f6d8..80eddb620 100644 --- a/Strategic/mapscreen.cpp +++ b/Strategic/mapscreen.cpp @@ -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 ) diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp index 7bb23a5d9..fe6e3e3e6 100644 --- a/Tactical/Interface Items.cpp +++ b/Tactical/Interface Items.cpp @@ -7352,6 +7352,8 @@ void DeleteItemStackPopup( ) fInterfacePanelDirty = DIRTYLEVEL2; + fMapScreenBottomDirty = TRUE; + //guiTacticalInterfaceFlags &= (~INTERFACE_NORENDERBUTTONS); // if ( !(guiTacticalInterfaceFlags & INTERFACE_MAPSCREEN ) ) diff --git a/Utils/Text.h b/Utils/Text.h index 1e928fa51..af1b5beae 100644 --- a/Utils/Text.h +++ b/Utils/Text.h @@ -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[]; diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index 5d436e490..8664404d9 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -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", diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index 413fffefd..949bf5f82 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -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", diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 751a65a39..864ab183c 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -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", diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index 649d5ea6f..194932929 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -3049,9 +3049,15 @@ STR16 pMapScreenBorderButtonHelpText[] = L"Espace arien (|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[] = { diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index 70f5dd1b6..a92a1dbc1 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -3036,7 +3036,14 @@ STR16 pMapScreenBorderButtonHelpText[] = L"Luftr|aum zeigen", L"Gegenstnde 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"^Nchste (|.)", // next page + L"Vorherige (|,)", // previous page + L"Sektor Inventar schlieen (|E|s|c)", // exit sector inventory }; STR16 pMapScreenBottomFastHelp[] = diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 6bee48006..2f1fbdbe3 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -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", diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index 0ab336786..1c1862da7 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -3049,9 +3049,15 @@ STR16 pMapScreenBorderButtonHelpText[] = L"Poka przestrze powietrzn (|A)", L"Poka przedmioty (|I)", L"Poka samoobron i wrogw (|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"Noe do rzucania", - L"Punch. W.", + L"Blunt W.", // TODO.Translate L"Granaty", L"Bomby", L"Apteczki", diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index c4bc1a549..e7b4df3c3 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -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[] = { diff --git a/Utils/_TaiwaneseText.cpp b/Utils/_TaiwaneseText.cpp index 217ad2721..e8c004690 100644 --- a/Utils/_TaiwaneseText.cpp +++ b/Utils/_TaiwaneseText.cpp @@ -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",