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

- A fix for the general slow down issue due to scope icons (by tazpn)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5369 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2012-07-09 08:14:38 +00:00
parent c92729f93d
commit d929b47aea
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface Items.cpp
+24 -5
View File
@@ -1375,6 +1375,15 @@ BOOLEAN InitInvSlotInterface( INV_REGION_DESC *pRegionDesc , INV_REGION_DESC *pC
FilenameForBPP("INTERFACE\\gold_key_button.sti", VObjectDesc.ImageFile); FilenameForBPP("INTERFACE\\gold_key_button.sti", VObjectDesc.ImageFile);
CHECKF( AddVideoObject( &VObjectDesc, &guiGoldKeyVO ) ); CHECKF( AddVideoObject( &VObjectDesc, &guiGoldKeyVO ) );
// added by Flugente
// HEADROCK HAM 4: Advanced Icons
if ( gGameExternalOptions.fScopeModes && gGameExternalOptions.fDisplayScopeModes )
{
VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
strcpy( VObjectDesc.ImageFile, "INTERFACE\\ItemInfoAdvancedIcons.STI" );
CHECKF( AddVideoObject( &VObjectDesc, &guiItemInfoAdvancedIcon) );
}
// Add cammo region // Add cammo region
MSYS_DefineRegion( &gSMInvCamoRegion, pCamoRegion->sX, pCamoRegion->sY, (INT16)(pCamoRegion->sX + CAMO_REGION_WIDTH ), (INT16)(pCamoRegion->sY + CAMO_REGION_HEIGHT ), MSYS_PRIORITY_HIGH, MSYS_DefineRegion( &gSMInvCamoRegion, pCamoRegion->sX, pCamoRegion->sY, (INT16)(pCamoRegion->sX + CAMO_REGION_WIDTH ), (INT16)(pCamoRegion->sY + CAMO_REGION_HEIGHT ), MSYS_PRIORITY_HIGH,
MSYS_NO_CURSOR, INVMoveCammoCallback, INVClickCammoCallback ); MSYS_NO_CURSOR, INVMoveCammoCallback, INVClickCammoCallback );
@@ -1501,6 +1510,12 @@ void ShutdownInvSlotInterface( )
DeleteVideoObjectFromIndex( guiGoldKeyVO ); DeleteVideoObjectFromIndex( guiGoldKeyVO );
if ( guiItemInfoAdvancedIcon != 0 )
{
DeleteVideoObjectFromIndex( guiItemInfoAdvancedIcon );
guiItemInfoAdvancedIcon = 0;
}
// Remove regions // Remove regions
// Add regions for inventory slots // Add regions for inventory slots
for ( cnt = 0; cnt < NUM_INV_SLOTS; cnt++ ) for ( cnt = 0; cnt < NUM_INV_SLOTS; cnt++ )
@@ -3810,17 +3825,21 @@ void INVRenderItem( UINT32 uiBuffer, SOLDIERTYPE * pSoldier, OBJECTTYPE *pObjec
gprintfinvalidate( sNewX, sNewY, pStr ); gprintfinvalidate( sNewX, sNewY, pStr );
} }
if ( gGameExternalOptions.fScopeModes && gGameExternalOptions.fDisplayScopeModes && pSoldier && pObject == &(pSoldier->inv[HANDPOS] ) && Item[pSoldier->inv[HANDPOS].usItem].usItemClass == IC_GUN ) if ( gGameExternalOptions.fScopeModes && gGameExternalOptions.fDisplayScopeModes
&& pSoldier && pObject == &(pSoldier->inv[HANDPOS] ) && Item[pSoldier->inv[HANDPOS].usItem].usItemClass == IC_GUN )
{ {
sNewX = sX + 5; // rather arbitrary sNewX = sX + 5; // rather arbitrary
sNewY = sY; sNewY = sY;
// added by Flugente // added by Flugente
// HEADROCK HAM 4: Advanced Icons // HEADROCK HAM 4: Advanced Icons
VOBJECT_DESC VObjectDesc; if (guiItemInfoAdvancedIcon == 0)
VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE; {
strcpy( VObjectDesc.ImageFile, "INTERFACE\\ItemInfoAdvancedIcons.STI" ); VOBJECT_DESC VObjectDesc;
AddStandardVideoObject( &VObjectDesc, &guiItemInfoAdvancedIcon ); VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
strcpy( VObjectDesc.ImageFile, "INTERFACE\\ItemInfoAdvancedIcons.STI" );
AddVideoObject( &VObjectDesc, &guiItemInfoAdvancedIcon);
}
std::map<INT8, OBJECTTYPE*> ObjList; std::map<INT8, OBJECTTYPE*> ObjList;
GetScopeLists(&pSoldier->inv[HANDPOS], ObjList); GetScopeLists(&pSoldier->inv[HANDPOS], ObjList);