1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

SHIFT+k shortcut on map screen to use same code as in tactical. Made ALT and CTRL +SHIFT+k shortcuts work on map screen (by Shadooow).

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9008 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2021-05-07 17:42:43 +00:00
parent 3eba067b6a
commit 22c3f36a92
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/mapscreen.cpp
+11 -9
View File
@@ -7842,15 +7842,17 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
//CHRISL: Swap gunsling //CHRISL: Swap gunsling
if ( bSelectedInfoChar != -1 && fShowInventoryFlag && UsingNewInventorySystem() == true ) if ( bSelectedInfoChar != -1 && fShowInventoryFlag && UsingNewInventorySystem() == true )
{ {
SOLDIERTYPE *pSoldier = MercPtrs[ gCharactersList[ bSelectedInfoChar ].usSolID ]; SOLDIERTYPE *pSoldier = MercPtrs[gCharactersList[bSelectedInfoChar].usSolID];
BOOLEAN handFit = (CanItemFitInPosition(pSoldier, &pSoldier->inv[HANDPOS], GUNSLINGPOCKPOS, FALSE) || (pSoldier->inv[HANDPOS].exists() == false && pSoldier->inv[SECONDHANDPOS].exists() == false)); if (fAlt)
BOOLEAN slingFit = (CanItemFitInPosition(pSoldier, &pSoldier->inv[GUNSLINGPOCKPOS], HANDPOS, FALSE) || pSoldier->inv[GUNSLINGPOCKPOS].exists() == false); // switch to knife, or from knife to gun
if(Item[pSoldier->inv[GUNSLINGPOCKPOS].usItem].twohanded && pSoldier->inv[SECONDHANDPOS].exists() == true) pSoldier->SwitchWeapons(TRUE);
handFit = FALSE; else if (fCtrl)
if( handFit == TRUE && slingFit == TRUE) // switch to sidearm, or from sidearm to non-sidearm gun
{ pSoldier->SwitchWeapons(FALSE, TRUE);
SwapObjs(&pSoldier->inv[HANDPOS], &pSoldier->inv[GUNSLINGPOCKPOS]); else
} // switch to and from gunsling
pSoldier->SwitchWeapons();
fTeamPanelDirty = TRUE; fTeamPanelDirty = TRUE;
fMapPanelDirty = TRUE; fMapPanelDirty = TRUE;
fInterfacePanelDirty = DIRTYLEVEL2; fInterfacePanelDirty = DIRTYLEVEL2;