From 9a11ddb37551e9ce02c43432010465f61cf38d2f Mon Sep 17 00:00:00 2001 From: Shadooow Date: Wed, 2 Feb 2022 15:39:35 +0000 Subject: [PATCH] Removed body inventory region in mapscreen for vehicles completely. There was no image rendered anyway, this way no popup message duplicating status will be shown and consumables won't popup the "Heh?" error either. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9290 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/mapscreen.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp index ae1042379..cabc42e0e 100644 --- a/Strategic/mapscreen.cpp +++ b/Strategic/mapscreen.cpp @@ -9400,7 +9400,15 @@ void CreateDestroyMapInvButton() else InitializeInvPanelCoordsOld(); - InitInvSlotInterface( gMapScreenInvPocketXY, &gSCamoXY, MAPInvMoveCallback, MAPInvClickCallback, MAPInvMoveCamoCallback, MAPInvClickCamoCallback, FALSE ); + if (bSelectedInfoChar != -1 && gCharactersList[bSelectedInfoChar].fValid) + { + SOLDIERTYPE* pSoldier = MercPtrs[gCharactersList[bSelectedInfoChar].usSolID]; + if (!(pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE)) + { + InitInvSlotInterface(gMapScreenInvPocketXY, &gSCamoXY, MAPInvMoveCallback, MAPInvClickCallback, MAPInvMoveCamoCallback, MAPInvClickCamoCallback, FALSE); + } + } + MSYS_EnableRegion(&gMPanelRegion); MSYS_EnableRegion(&gMapMercWeightRegion); MSYS_EnableRegion(&gMapMercCamoRegion);