mirror of
https://github.com/1dot13/source.git
synced 2026-09-02 14:36:06 +02:00
fixed bugs when handling items that are both food and drug
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5419 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -13,6 +13,7 @@
|
||||
#include "Random.h"
|
||||
#include "Text.h"
|
||||
#include "Interface.h"
|
||||
#include "Food.h" // added by Flugente
|
||||
#endif
|
||||
|
||||
//forward declarations of common classes to eliminate includes
|
||||
@@ -71,7 +72,7 @@ BOOLEAN ApplyDrugs( SOLDIERTYPE *pSoldier, OBJECTTYPE *pObject )
|
||||
UINT32 foodtype = Item[pObject->usItem].foodtype;
|
||||
|
||||
// if not a food item, nothing to see here
|
||||
if ( foodtype > 0 )
|
||||
if ( gGameOptions.fFoodSystem && foodtype > 0 )
|
||||
consumeitem = FALSE;
|
||||
|
||||
// set flag: we are on drugs
|
||||
@@ -254,6 +255,9 @@ BOOLEAN ApplyDrugs( SOLDIERTYPE *pSoldier, OBJECTTYPE *pObject )
|
||||
// Dirty panel
|
||||
fInterfacePanelDirty = DIRTYLEVEL2;
|
||||
|
||||
if ( !consumeitem )
|
||||
ApplyFood( pSoldier, pObject );
|
||||
|
||||
return( TRUE );
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user