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

- Multiplayer Bugfix: Fixed M.E.R.C inventory glitches on laptop site

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6615 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-11-16 18:35:55 +00:00
parent 5878355d61
commit 9bc09aff3d
2 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/AimMembers.cpp
-21
View File
@@ -1582,12 +1582,6 @@ BOOLEAN DisplayMercsInventory(UINT8 ubMercID)
UINT16 wnameY = AIM_MEMBER_WEAPON_NAME_Y; UINT16 wnameY = AIM_MEMBER_WEAPON_NAME_Y;
PosX = WEAPONBOX_X_NSGI+3; // + 3 ( 1 to take care of the shadow, +2 to get past the weapon box border ) PosX = WEAPONBOX_X_NSGI+3; // + 3 ( 1 to take care of the shadow, +2 to get past the weapon box border )
PosY = WEAPONBOX_Y_NSGI; PosY = WEAPONBOX_Y_NSGI;
if(is_networked && guiCurrentLaptopMode == LAPTOP_MODE_MERC_FILES)
{
PosX+=0;
PosY+=24;
wnameY-=26;
}
//tais: disable Weaponbox Mouseregions to stop crashing when changing kit selection and hovering over item //tais: disable Weaponbox Mouseregions to stop crashing when changing kit selection and hovering over item
//tooltips for weaponbox //tooltips for weaponbox
@@ -1649,15 +1643,6 @@ BOOLEAN DisplayMercsInventory(UINT8 ubMercID)
SetRegionHelpEndCallback( &(gWeaponboxFasthelpRegion[ubItemCount-1]), HelpTextDoneCallback ); SetRegionHelpEndCallback( &(gWeaponboxFasthelpRegion[ubItemCount-1]), HelpTextDoneCallback );
MSYS_EnableRegion( &gWeaponboxFasthelpRegion[ubItemCount-1] ); MSYS_EnableRegion( &gWeaponboxFasthelpRegion[ubItemCount-1] );
// WANNE: In a multiplayer game also display the items name on the MERC website
if (is_networked && guiCurrentLaptopMode == LAPTOP_MODE_MERC_FILES)
{
//if this will only be a single line, center it in the box
if( ( DisplayWrappedString( (UINT16)(PosX-1), wnameY, AIM_MEMBER_WEAPON_NAME_WIDTH, 2, AIM_M_WEAPON_TEXT_FONT, AIM_M_WEAPON_TEXT_COLOR, gzItemName, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED | DONT_DISPLAY_TEXT ) / GetFontHeight( AIM_M_WEAPON_TEXT_FONT ) ) == 1 )
DisplayWrappedString( (UINT16)(PosX-1), (UINT16)(wnameY+GetFontHeight( AIM_M_WEAPON_TEXT_FONT )/2), AIM_MEMBER_WEAPON_NAME_WIDTH, 2, AIM_M_WEAPON_TEXT_FONT, AIM_M_WEAPON_TEXT_COLOR, gzItemName, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED );
else
DisplayWrappedString( (UINT16)(PosX-1), wnameY, AIM_MEMBER_WEAPON_NAME_WIDTH, 2, AIM_M_WEAPON_TEXT_FONT, AIM_M_WEAPON_TEXT_COLOR, gzItemName, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED );
}
if(ubColumnCount == WEAPONBOX_COLUMNS) if(ubColumnCount == WEAPONBOX_COLUMNS)
{ {
@@ -1679,12 +1664,6 @@ BOOLEAN DisplayMercsInventory(UINT8 ubMercID)
UINT16 wnameY = AIM_MEMBER_WEAPON_NAME_Y; UINT16 wnameY = AIM_MEMBER_WEAPON_NAME_Y;
PosX = WEAPONBOX_X+3; // + 3 ( 1 to take care of the shadow, +2 to get past the weapon box border ) PosX = WEAPONBOX_X+3; // + 3 ( 1 to take care of the shadow, +2 to get past the weapon box border )
PosY = WEAPONBOX_Y; PosY = WEAPONBOX_Y;
if(is_networked && guiCurrentLaptopMode == LAPTOP_MODE_MERC_FILES)
{
PosX+=20;
PosY-=28;
wnameY-=28;
}
for(i=0; i<gMercProfiles[ubMercID].inv.size(); i++) for(i=0; i<gMercProfiles[ubMercID].inv.size(); i++)
{ {
Laptop/mercs Files.cpp
BIN
View File
Binary file not shown.