From 6438f9164d475cff4e98f13d512a9740b289d183 Mon Sep 17 00:00:00 2001 From: ChrisL Date: Fri, 11 Jul 2008 16:49:12 +0000 Subject: [PATCH] Corrected a display problem with the KeyRing popup when playing in OIV mode. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2239 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Interface Panels.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Tactical/Interface Panels.cpp b/Tactical/Interface Panels.cpp index fb7030a7..d22cd6b2 100644 --- a/Tactical/Interface Panels.cpp +++ b/Tactical/Interface Panels.cpp @@ -6436,7 +6436,11 @@ void KeyRingItemPanelButtonCallback( MOUSE_REGION * pRegion, INT32 iReason ) InvalidateRegion( 0, 107, 261, 359 ); } - InitKeyRingPopup( pSoldier, 35, sStartYPosition, sWidth, sHeight ); + //CHRISL: In OIV mode, we don't want to offset the keyring popup. + if(UsingNewInventorySystem() == false) + InitKeyRingPopup( pSoldier, 0, sStartYPosition, sWidth, sHeight ); + else + InitKeyRingPopup( pSoldier, 35, sStartYPosition, sWidth, sHeight ); } } @@ -7019,3 +7023,4 @@ void GoToMapScreenFromTactical( void ) +