mirror of
https://github.com/1dot13/source.git
synced 2026-08-05 14:00:23 +02:00
- The facility performance tag now determines the effectiveness of the interrogation assignment (100 = standard).
- Canteens can now be refilled even if the food system is off - If you set a handcuff's item to class from MISC (<usItemClass>268435456</usItemClass>)to KIT (<usItemClass>8192</usItemClass>), it will be treated as a stack of binders. Repeated use on enemies consumes the item. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5740 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
+2
-7
@@ -743,12 +743,6 @@ UINT8 GetWaterQuality(INT16 asMapX, INT16 asMapY, INT8 asMapZ)
|
||||
// a function that tries to fill up all canteens in this sector
|
||||
void SectorFillCanteens( void )
|
||||
{
|
||||
if ( !gGameOptions.fFoodSystem )
|
||||
{
|
||||
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szFoodTextStr[STR_FOOD_ERROR_NO_FOOD_SYSTEM] );
|
||||
return;
|
||||
}
|
||||
|
||||
// no functionality if not in tactical or in combat, or nobody is here
|
||||
// can be called from a messagebox, thus the check for MSG_BOX_SCREEN
|
||||
if ( (guiCurrentScreen != GAME_SCREEN && guiCurrentScreen != MSG_BOX_SCREEN) || (gTacticalStatus.uiFlags & INCOMBAT) || gusSelectedSoldier == NOBODY )
|
||||
@@ -814,7 +808,8 @@ void SectorFillCanteens( void )
|
||||
|
||||
// it would be pretty pointless to fill our canteens and then not to drink from them even though we are hungry. If there is an unlimited water source in this sector, drink from our
|
||||
// freshly filled canteens. Thus calling this function repeatedly will cause us to drink till we're full, and restore our canteens to full level
|
||||
EatFromInventory( pSoldier, TRUE );
|
||||
if ( gGameOptions.fFoodSystem )
|
||||
EatFromInventory( pSoldier, TRUE );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user