From 864d9acb2719638d9ab2de1df85b2354a5d62c8c Mon Sep 17 00:00:00 2001 From: Wanne Date: Wed, 11 Apr 2012 11:21:04 +0000 Subject: [PATCH] - HAM 5: Bugfixes o Fixed a few positions for the sector inventory in widescreen resolution o TODO: The file "Map Screen Interface Map Inventory.cpp" needs to be adjusted (The "xResOffset" needs to be added to the x-positions of the images) for widescreen resolutions git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5187 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/Map Screen Interface Map.cpp | 4 ++-- Strategic/mapscreen.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Strategic/Map Screen Interface Map.cpp b/Strategic/Map Screen Interface Map.cpp index 823e09101..46b044a21 100644 --- a/Strategic/Map Screen Interface Map.cpp +++ b/Strategic/Map Screen Interface Map.cpp @@ -3643,8 +3643,8 @@ BOOLEAN TraceCharAnimatedRoute( PathStPtr pPath, BOOLEAN fCheckFlag, BOOLEAN fFo usArrowWidth = hMapHandle->pETRLEObject[ uiArrowNumToDraw ].usWidth; usArrowHeight = hMapHandle->pETRLEObject[ uiArrowNumToDraw ].usHeight; - BltVideoObject(FRAME_BUFFER, hMapHandle, uiArrowNumToDraw, iArrowX, iArrowY, VO_BLT_SRCTRANSPARENCY, NULL ); - InvalidateRegion( iArrowX, iArrowY, iArrowX + usArrowWidth, iArrowY + usArrowHeight ); + BltVideoObject(FRAME_BUFFER, hMapHandle, uiArrowNumToDraw, iArrowX + xResOffset, iArrowY, VO_BLT_SRCTRANSPARENCY, NULL ); + InvalidateRegion( iArrowX + xResOffset, iArrowY, iArrowX + usArrowWidth + xResOffset, iArrowY + usArrowHeight ); //ARM who knows what it should return here? return FALSE; diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp index 03d53e979..549449ab0 100644 --- a/Strategic/mapscreen.cpp +++ b/Strategic/mapscreen.cpp @@ -4767,13 +4767,13 @@ UINT32 MapScreenHandle(void) // HEADROCK HAM 5: New pathing arrows may replace the above eventually, but for now a separate variable will do. VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE; - if (iResolution == 0) + if (iResolution >= _640x480 && iResolution < _800x600) FilenameForBPP("INTERFACE\\map_pathing_arrows_640.sti", VObjectDesc.ImageFile); - else if (iResolution == 1) + else if (iResolution < _1024x768) FilenameForBPP("INTERFACE\\map_pathing_arrows_800.sti", VObjectDesc.ImageFile); - else if (iResolution == 2) + else FilenameForBPP("INTERFACE\\map_pathing_arrows_1024.sti", VObjectDesc.ImageFile); - + CHECKF(AddVideoObject(&VObjectDesc, &guiMapPathingArrows)); VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;