diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp index e24e6443..26037662 100644 --- a/Strategic/mapscreen.cpp +++ b/Strategic/mapscreen.cpp @@ -1145,7 +1145,7 @@ BOOLEAN InitializeInvPanelCoordsOld() TIME_REMAINING_X = xResOffset + 215; CONTRACT_X = xResOffset + 185; TRASH_CAN_X = xResOffset + 176; - MAP_KEYRING_X = xResOffset + 217; + MAP_KEYRING_X = xResOffset + 217; //218/165 on Inventory_Bottom_Panel.sti POP_UP_BOX_X = xResOffset + 120; STR_X = xResOffset + 112; LVL_X = xResOffset + 159; @@ -1374,7 +1374,7 @@ BOOLEAN InitializeInvPanelCoordsNew() TIME_REMAINING_X = xResOffset + 215; CONTRACT_X = xResOffset + 185; TRASH_CAN_X = xResOffset + 209; - MAP_KEYRING_X = xResOffset + 180; + MAP_KEYRING_X = xResOffset + 186; //184/19 on Inventory_Bottom_Panel.sti POP_UP_BOX_X = xResOffset + 120; STR_X = xResOffset + 112; LVL_X = xResOffset + 159; @@ -1592,7 +1592,7 @@ BOOLEAN InitializeInvPanelCoordsNew() TRASH_CAN_HEIGHT = 239 - 217; // keyring - MAP_KEYRING_Y = 127; + MAP_KEYRING_Y = 126; //Text offsets Y_OFFSET = 2; diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp index 07787269..373078aa 100644 --- a/Tactical/Interface Items.cpp +++ b/Tactical/Interface Items.cpp @@ -1662,13 +1662,17 @@ void HandleRenderInvSlots( SOLDIERTYPE *pSoldier, UINT8 fDirtyLevel ) // CHRISL: adjust settings to use variables for coords if ( guiCurrentItemDescriptionScreen != MAP_SCREEN ) { - sX=((UsingNewInventorySystem() == false))?496:221; - sY=((UsingNewInventorySystem() == false))?INV_INTERFACE_START_Y+106:INV_INTERFACE_START_Y+5; + //sX=((UsingNewInventorySystem() == false))?496:221; + //sY=((UsingNewInventorySystem() == false))?INV_INTERFACE_START_Y+106:INV_INTERFACE_START_Y+5; + sX=KEYRING_X; + sY=KEYRING_Y; } else { - sX=((UsingNewInventorySystem() == false))?217:188; - sY=((UsingNewInventorySystem() == false))?271:126; + //sX=((UsingNewInventorySystem() == false))?217:188; + //sY=((UsingNewInventorySystem() == false))?271:126; + sX=MAP_KEYRING_X; + sY=MAP_KEYRING_Y; } BltVideoObjectFromIndex( guiSAVEBUFFER, guiGoldKeyVO, 0, sX, sY, VO_BLT_SRCTRANSPARENCY, NULL ); RestoreExternBackgroundRect( sX, sY, 29, 23 ); diff --git a/Tactical/Interface Panels.cpp b/Tactical/Interface Panels.cpp index c7b12be3..1ec1b0ce 100644 --- a/Tactical/Interface Panels.cpp +++ b/Tactical/Interface Panels.cpp @@ -1617,9 +1617,9 @@ BOOLEAN InitializeSMPanelCoordsOld() INTERFACE_CLOCK_Y = ( 119 + INV_INTERFACE_START_Y ); LOCATION_NAME_Y = ( 65 + INTERFACE_START_Y ); - // Keyring - KEYRING_X = xResOffset + 494; - KEYRING_Y = (105 + INV_INTERFACE_START_Y); + // Keyring 496/106 on Inventory_Bottom_Panel.sti + KEYRING_X = xResOffset + 496; + KEYRING_Y = (106 + INV_INTERFACE_START_Y); // so we got everything "dynamic" now we just return TRUE return ( TRUE ); @@ -1989,8 +1989,8 @@ BOOLEAN InitializeSMPanelCoordsNew() INTERFACE_CLOCK_Y = ( 117 + INV_INTERFACE_START_Y ); LOCATION_NAME_Y = ( 89 + INTERFACE_START_Y ); - //Keyring - KEYRING_X = xResOffset + 217; //209; + //Keyring 218/5 on Inventory_Bottom_Panel.sti + KEYRING_X = xResOffset + 219; //209; KEYRING_Y = (5 + INV_INTERFACE_START_Y); // so we got everything "dynamic" now we just return TRUE