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

- fixed key ring icon position for all resolutions

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5540 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2012-08-27 20:56:05 +00:00
parent 623dcca3ed
commit a535c48c49
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/mapscreen.cpp
+3 -3
View File
@@ -1145,7 +1145,7 @@ BOOLEAN InitializeInvPanelCoordsOld()
TIME_REMAINING_X = xResOffset + 215; TIME_REMAINING_X = xResOffset + 215;
CONTRACT_X = xResOffset + 185; CONTRACT_X = xResOffset + 185;
TRASH_CAN_X = xResOffset + 176; 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; POP_UP_BOX_X = xResOffset + 120;
STR_X = xResOffset + 112; STR_X = xResOffset + 112;
LVL_X = xResOffset + 159; LVL_X = xResOffset + 159;
@@ -1374,7 +1374,7 @@ BOOLEAN InitializeInvPanelCoordsNew()
TIME_REMAINING_X = xResOffset + 215; TIME_REMAINING_X = xResOffset + 215;
CONTRACT_X = xResOffset + 185; CONTRACT_X = xResOffset + 185;
TRASH_CAN_X = xResOffset + 209; 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; POP_UP_BOX_X = xResOffset + 120;
STR_X = xResOffset + 112; STR_X = xResOffset + 112;
LVL_X = xResOffset + 159; LVL_X = xResOffset + 159;
@@ -1592,7 +1592,7 @@ BOOLEAN InitializeInvPanelCoordsNew()
TRASH_CAN_HEIGHT = 239 - 217; TRASH_CAN_HEIGHT = 239 - 217;
// keyring // keyring
MAP_KEYRING_Y = 127; MAP_KEYRING_Y = 126;
//Text offsets //Text offsets
Y_OFFSET = 2; Y_OFFSET = 2;
Tactical/Interface Items.cpp
+8 -4
View File
@@ -1662,13 +1662,17 @@ void HandleRenderInvSlots( SOLDIERTYPE *pSoldier, UINT8 fDirtyLevel )
// CHRISL: adjust settings to use variables for coords // CHRISL: adjust settings to use variables for coords
if ( guiCurrentItemDescriptionScreen != MAP_SCREEN ) if ( guiCurrentItemDescriptionScreen != MAP_SCREEN )
{ {
sX=((UsingNewInventorySystem() == false))?496:221; //sX=((UsingNewInventorySystem() == false))?496:221;
sY=((UsingNewInventorySystem() == false))?INV_INTERFACE_START_Y+106:INV_INTERFACE_START_Y+5; //sY=((UsingNewInventorySystem() == false))?INV_INTERFACE_START_Y+106:INV_INTERFACE_START_Y+5;
sX=KEYRING_X;
sY=KEYRING_Y;
} }
else else
{ {
sX=((UsingNewInventorySystem() == false))?217:188; //sX=((UsingNewInventorySystem() == false))?217:188;
sY=((UsingNewInventorySystem() == false))?271:126; //sY=((UsingNewInventorySystem() == false))?271:126;
sX=MAP_KEYRING_X;
sY=MAP_KEYRING_Y;
} }
BltVideoObjectFromIndex( guiSAVEBUFFER, guiGoldKeyVO, 0, sX, sY, VO_BLT_SRCTRANSPARENCY, NULL ); BltVideoObjectFromIndex( guiSAVEBUFFER, guiGoldKeyVO, 0, sX, sY, VO_BLT_SRCTRANSPARENCY, NULL );
RestoreExternBackgroundRect( sX, sY, 29, 23 ); RestoreExternBackgroundRect( sX, sY, 29, 23 );
Tactical/Interface Panels.cpp
+5 -5
View File
@@ -1617,9 +1617,9 @@ BOOLEAN InitializeSMPanelCoordsOld()
INTERFACE_CLOCK_Y = ( 119 + INV_INTERFACE_START_Y ); INTERFACE_CLOCK_Y = ( 119 + INV_INTERFACE_START_Y );
LOCATION_NAME_Y = ( 65 + INTERFACE_START_Y ); LOCATION_NAME_Y = ( 65 + INTERFACE_START_Y );
// Keyring // Keyring 496/106 on Inventory_Bottom_Panel.sti
KEYRING_X = xResOffset + 494; KEYRING_X = xResOffset + 496;
KEYRING_Y = (105 + INV_INTERFACE_START_Y); KEYRING_Y = (106 + INV_INTERFACE_START_Y);
// so we got everything "dynamic" now we just return TRUE // so we got everything "dynamic" now we just return TRUE
return ( TRUE ); return ( TRUE );
@@ -1989,8 +1989,8 @@ BOOLEAN InitializeSMPanelCoordsNew()
INTERFACE_CLOCK_Y = ( 117 + INV_INTERFACE_START_Y ); INTERFACE_CLOCK_Y = ( 117 + INV_INTERFACE_START_Y );
LOCATION_NAME_Y = ( 89 + INTERFACE_START_Y ); LOCATION_NAME_Y = ( 89 + INTERFACE_START_Y );
//Keyring //Keyring 218/5 on Inventory_Bottom_Panel.sti
KEYRING_X = xResOffset + 217; //209; KEYRING_X = xResOffset + 219; //209;
KEYRING_Y = (5 + INV_INTERFACE_START_Y); KEYRING_Y = (5 + INV_INTERFACE_START_Y);
// so we got everything "dynamic" now we just return TRUE // so we got everything "dynamic" now we just return TRUE