1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

SpaceViking's random number and CTH adjustments.

Browse Source 
OIV Graphic alignment correction.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2242 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
ChrisL
2008-07-17 00:16:16 +00:00
parent ad96055687
commit ec87dd51e6
3 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface Panels.cpp
+12 -2
View File
@@ -3476,7 +3476,13 @@ void SMInvClickCallback( MOUSE_REGION * pRegion, INT32 iReason )
invWidth = 314;
//InitItemStackPopup( gpSMCurrentMerc, (UINT8)uiHandPos, SM_ITEMDESC_START_X, SM_ITEMDESC_START_Y, SM_ITEMDESC_WIDTH, SM_ITEMDESC_HEIGHT );
InitItemStackPopup( gpSMCurrentMerc, (UINT8)uiHandPos, 248, INV_INTERFACE_START_Y, invWidth, ( SCREEN_HEIGHT - INV_INTERFACE_START_Y ) );
//CHRISL: In OIV mode, we don't want to offset the keyring popup.
UINT8 inv_interface_start_x;
if(UsingNewInventorySystem() == false)
inv_interface_start_x = 213;
else
inv_interface_start_x = 248;
InitItemStackPopup( gpSMCurrentMerc, (UINT8)uiHandPos, inv_interface_start_x, INV_INTERFACE_START_Y, invWidth, ( SCREEN_HEIGHT - INV_INTERFACE_START_Y ) );
}
}
@@ -6373,7 +6379,11 @@ void BeginKeyPanelFromKeyShortcut( )
if( guiTacticalInterfaceFlags & INTERFACE_SHOPKEEP_INTERFACE )
return;
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 );
}