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 error in UDB that could crash the game with displays after dirt system

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5578 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2012-09-19 23:34:41 +00:00
parent f24e202fe7
commit 446086c506
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface Enhanced.cpp
+5 -5
View File
@@ -3930,16 +3930,16 @@ void InternalInitEDBTooltipRegion( OBJECTTYPE * gpItemDescObject, UINT32 guiCurr
if ( gGameExternalOptions.fDirtSystem ) if ( gGameExternalOptions.fDirtSystem )
{ {
///////////////////// DIRT MODIFICATOR ///////////////////// DIRT MODIFICATOR
if (cnt >= sFirstLine && cnt < sLastLine) if ( Item[gpItemDescObject->usItem].usItemClass & (IC_GUN|IC_LAUNCHER) )
{ {
if ( Item[gpItemDescObject->usItem].usItemClass & (IC_GUN|IC_LAUNCHER) ) if (cnt >= sFirstLine && cnt < sLastLine )
{ {
swprintf( pStr, L"%s%s", szUDBAdvStatsTooltipText[ 57 ], szUDBAdvStatsExplanationsTooltipText[ 57 ]); swprintf( pStr, L"%s%s", szUDBAdvStatsTooltipText[ 57 ], szUDBAdvStatsExplanationsTooltipText[ 57 ]);
SetRegionFastHelpText( &(gUDBFasthelpRegions[ iFirstDataRegion + (cnt-sFirstLine) ]), pStr );
MSYS_EnableRegion( &gUDBFasthelpRegions[ iFirstDataRegion + (cnt-sFirstLine) ] );
} }
SetRegionFastHelpText( &(gUDBFasthelpRegions[ iFirstDataRegion + (cnt-sFirstLine) ]), pStr ); cnt++;
MSYS_EnableRegion( &gUDBFasthelpRegions[ iFirstDataRegion + (cnt-sFirstLine) ] );
} }
cnt++;
} }
gubDescBoxTotalAdvLines = (UINT8)cnt; gubDescBoxTotalAdvLines = (UINT8)cnt;
Tactical/Turn Based Input.cpp
+7 -3
View File
@@ -4449,18 +4449,22 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
/*// Flugente: spawn items while debugging /*// Flugente: spawn items while debugging
if ( gusSelectedSoldier != NOBODY ) if ( gusSelectedSoldier != NOBODY )
{ {
static UINT16 usitem = 142; static UINT16 usitem = 269;
static INT16 status = 100; static INT16 status = 100;
static FLOAT temperature = 0.0; static FLOAT temperature = 0.0;
OBJECTTYPE newobj; OBJECTTYPE newobj;
CreateItem( usitem, status, &newobj ); CreateItem( usitem, status, &newobj );
(newobj)[0]->data.bTemperature = temperature; (newobj)[0]->data.bTemperature = temperature;
AddItemToPool( MercPtrs[ gusSelectedSoldier ]->sGridNo, &newobj, 1, 0, 0, -1 );
if ( !AutoPlaceObject( MercPtrs[ gusSelectedSoldier ], &newobj, FALSE ) )
AddItemToPool( MercPtrs[ gusSelectedSoldier ]->sGridNo, &newobj, 1, 0, 0, -1 );
CreateItem( usitem, status, &newobj ); CreateItem( usitem, status, &newobj );
(newobj)[0]->data.bTemperature = temperature; (newobj)[0]->data.bTemperature = temperature;
AddItemToPool( MercPtrs[ gusSelectedSoldier ]->sGridNo, &newobj, 1, 0, 0, -1 );
if ( !AutoPlaceObject( MercPtrs[ gusSelectedSoldier ], &newobj, FALSE ) )
AddItemToPool( MercPtrs[ gusSelectedSoldier ]->sGridNo, &newobj, 1, 0, 0, -1 );
}*/ }*/
} }
else else