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

New Feature: Drug System Overhaul. The drug system has been completely overhauled.

Browse Source 
Requires GameDir >= r2257.

For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=341541&#msg_341541

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7896 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2015-06-28 17:47:25 +00:00
parent ceea35b0e9
commit 4d9140da57
61 changed files with 1667 additions and 871 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface Enhanced.cpp
+8 -8
View File
@@ -2571,7 +2571,7 @@ void InternalInitEDBTooltipRegion( OBJECTTYPE * gpItemDescObject, UINT32 guiCurr
}
//////////////////// ALCOHOL
if (Item[ gpItemDescObject->usItem ].alcohol)
if ( Item[gpItemDescObject->usItem].alcohol > 0.0f )
{
swprintf( pStr, L"%s%s", szUDBGenSecondaryStatsTooltipText[ 22 ], szUDBGenSecondaryStatsExplanationsTooltipText[ 22 ]);
SetRegionFastHelpText( &(gUDBFasthelpRegions[ iFirstDataRegion + cnt ]), pStr );
@@ -4090,7 +4090,7 @@ void InternalInitEDBTooltipRegion( OBJECTTYPE * gpItemDescObject, UINT32 guiCurr
cnt++;
}
////////////////////// PORTION SIZE
if ( Food[foodtype].ubPortionSize != 0 )
if ( Item[gpItemDescObject->usItem].usPortionSize != 0 )
{
if (cnt >= sFirstLine && cnt < sLastLine)
{
@@ -5769,8 +5769,8 @@ void DrawAdvancedStats( OBJECTTYPE * gpItemDescObject )
}
cnt++;
}
if ( ( Food[Item[gpItemDescObject->usItem].foodtype].ubPortionSize > 0 ) ||
( fComparisonMode && Food[Item[gpComparedItemDescObject->usItem].foodtype].ubPortionSize > 0 ) )
if ( (Item[gpItemDescObject->usItem].usPortionSize > 0) ||
(fComparisonMode && Item[gpComparedItemDescObject->usItem].usPortionSize > 0) )
{
//////////////////// PORTION SIZE
if (cnt >= sFirstLine && cnt < sLastLine)
@@ -6129,8 +6129,8 @@ void DrawSecondaryStats( OBJECTTYPE * gpItemDescObject )
}
//////////////////// ALCOHOL
if ( ( Item[ gpItemDescObject->usItem ].alcohol ) ||
( fComparisonMode && Item[ gpComparedItemDescObject->usItem ].alcohol ) )
if ( (Item[gpItemDescObject->usItem].alcohol > 0.0f) ||
(fComparisonMode && Item[gpComparedItemDescObject->usItem].alcohol > 0.0f) )
{
BltVideoObjectFromIndex( guiSAVEBUFFER, guiItemInfoSecondaryIcon, 22, gItemDescGenSecondaryRegions[cnt].sLeft+sOffsetX, gItemDescGenSecondaryRegions[cnt].sTop+sOffsetY, VO_BLT_SRCTRANSPARENCY, NULL );
cnt++;
@@ -14057,10 +14057,10 @@ void DrawAdvancedValues( OBJECTTYPE *gpItemDescObject )
cnt++;
}
////////////////////////// PORTION SIZE
iModifier[0] = Food[fFoodtype].ubPortionSize;
iModifier[0] = Item[gpItemDescObject->usItem].usPortionSize;
if( fComparisonMode )
{
iComparedModifier[0] = Food[fComparedFoodtype].ubPortionSize;
iComparedModifier[0] = Item[gpItemDescObject->usItem].usPortionSize;
iModifier[0] = iComparedModifier[0] - iModifier[0];
}
sTop = gItemDescAdvRegions[cnt-sFirstLine][1].sTop;