Merged revision(s) 6976 from branches/ja2_source_official_2014:

- Food system change: if a soldier autofeeds, he will refill his canteens if the sector has drinkable water
- do not display corruption backgriund in 1.13
- removed hardcoded direction number

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6977 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Tactical/Food.cpp

@@ -611,7 +611,11 @@ void HourlyFoodAutoDigestion( SOLDIERTYPE *pSoldier )
 
 		// search inventory for food, and eat it
 		if ( !eatinginfacility )
+		{
+			SoldierAutoFillCanteens(pSoldier);
+
 			EatFromInventory( pSoldier, FALSE );
+		}
 	}	
 }
 
@@ -621,7 +625,7 @@ void EatFromInventory( SOLDIERTYPE *pSoldier, BOOLEAN fcanteensonly )
 	if ( !pSoldier )
 		return;
 
-	// don't eat if not necessary ( note that if the play decides to eat manually, he can achieve better results. This is intended to award micro-management)
+	// don't eat if not necessary (note that if the player decides to eat manually, he can achieve better results. This is intended to award micro-management)
 	if ( pSoldier->bFoodLevel > FoodMoraleMods[FOOD_MERC_START_CONSUME].bThreshold && pSoldier->bDrinkLevel > FoodMoraleMods[FOOD_MERC_START_CONSUME].bThreshold )
 		return;
 
@@ -796,7 +800,7 @@ void SectorFillCanteens( void )
 		bLastTeamID = gTacticalStatus.Team[ gbPlayerNum ].bLastID;
 
 		// loop through all mercs
-		for ( pSoldier = MercPtrs[ bMercID ]; bMercID <= bLastTeamID; bMercID++, pSoldier++)
+		for ( pSoldier = MercPtrs[ bMercID ]; bMercID <= bLastTeamID; ++bMercID, pSoldier++)
 		{
 			//if the merc is in this sector
 			if ( pSoldier->bActive && pSoldier->ubProfile != NO_PROFILE && pSoldier->bInSector && ( pSoldier->sSectorX == gWorldSectorX ) && ( pSoldier->sSectorY == gWorldSectorY ) && ( pSoldier->bSectorZ == gbWorldSectorZ) )
@@ -870,7 +874,7 @@ void SectorFillCanteens( void )
 		bLastTeamID = gTacticalStatus.Team[ gbPlayerNum ].bLastID;
 
 		// loop through all mercs
-		for ( pSoldier = MercPtrs[ bMercID ]; bMercID <= bLastTeamID; bMercID++, pSoldier++)
+		for ( pSoldier = MercPtrs[ bMercID ]; bMercID <= bLastTeamID; ++bMercID, pSoldier++)
 		{
 			//if the merc is in this sector
 			if ( pSoldier->bActive && pSoldier->ubProfile != NO_PROFILE && pSoldier->bInSector && ( pSoldier->sSectorX == gWorldSectorX ) && ( pSoldier->sSectorY == gWorldSectorY ) && ( pSoldier->bSectorZ == gbWorldSectorZ) )
@@ -1015,3 +1019,45 @@ OBJECTTYPE* GetUsableWaterDrumInSector( void )
 	return( NULL );
 }
 
+// soldier refills canteen while auto-consuming. Only clean sector water souces are consumed, an sector inventory is not touched (sector is likely not loaded)
+void SoldierAutoFillCanteens(SOLDIERTYPE *pSoldier)
+{
+	// no functionality if in combat, invalid/travelling/asleep/non-profile soldier
+	if ( (gTacticalStatus.uiFlags & INCOMBAT) || !pSoldier || !pSoldier->bInSector || pSoldier->flags.fMercAsleep || pSoldier->ubProfile == NO_PROFILE )
+		return;
+
+	// determine if there are any patches of water in this sector.
+	// If so, fill up all refillable water containers (= canteens)
+	UINT8 waterquality = GetWaterQuality(pSoldier->sSectorX, pSoldier->sSectorY, pSoldier->bSectorZ);
+
+	// drink from sector only if water is ok - this happens automatically, so if we use poisoned water, we will slowly poison ourselves without the player noticing
+	if ( waterquality == WATER_DRINKABLE )
+	{
+		// the temperature of the water in this sector (temperature reflects the quality)
+		FLOAT addtemperature = OVERHEATING_MAX_TEMPERATURE;
+
+		// first step: fill all canteens in inventories	
+		INT8 invsize = (INT8)pSoldier->inv.size();									// remember inventorysize, so we don't call size() repeatedly
+		for ( INT8 bLoop = 0; bLoop < invsize; ++bLoop)								// ... for all items in our inventory ...
+		{
+			// ... if Item exists and is canteen (that can have drink points) ...
+			if (pSoldier->inv[bLoop].exists() == true && Item[pSoldier->inv[bLoop].usItem].canteen && Food[Item[pSoldier->inv[bLoop].usItem].foodtype].bDrinkPoints > 0)
+			{
+				OBJECTTYPE* pObj = &(pSoldier->inv[bLoop]);							// ... get pointer for this item ...
+
+				if ( pObj != NULL )													// ... if pointer is not obviously useless ...
+				{
+					for(INT16 i = 0; i < pObj->ubNumberOfObjects; ++i)				// ... there might be multiple items here (item stack), so for each one ...
+					{
+						UINT16 status = (*pObj)[i]->data.objectStatus;
+						UINT16 statusmmissing = max(0, 100 - status);
+						FLOAT temperature = (*pObj)[i]->data.bTemperature;
+																
+						(*pObj)[i]->data.objectStatus = 100;						// refill canteen
+						(*pObj)[i]->data.bTemperature = (status * temperature + statusmmissing * addtemperature)/100;
+					}
+				}
+			}
+		}
+	}
+}

Tactical/Food.h

@@ -93,4 +93,7 @@ void SectorFillCanteens( void );
 
 OBJECTTYPE* GetUsableWaterDrumInSector( void );
 
+// soldier refills canteen while auto-consuming. Only clean sector water souces are consumed, an sector inventory is not touched (sector is likely not loaded)
+void SoldierAutoFillCanteens(SOLDIERTYPE *pSoldier);
+
 #endif

Tactical/Handle Items.cpp

@@ -5815,7 +5815,7 @@ BOOLEAN NearbyGroundSeemsWrong( SOLDIERTYPE * pSoldier, INT32 sGridNo, BOOLEAN f
 	}
 
 	// check every tile around gridno for the presence of "nasty stuff"
-	for (ubDirection = 0; ubDirection < 8; ubDirection++)
+	for (ubDirection = 0; ubDirection < NUM_WORLD_DIRECTIONS; ++ubDirection)
 	{
 		if ( fCheckAroundGridNo )
 		{
@@ -5837,7 +5837,7 @@ BOOLEAN NearbyGroundSeemsWrong( SOLDIERTYPE * pSoldier, INT32 sGridNo, BOOLEAN f
 		{
 			// we should just be checking the gridno
 			sNextGridNo = sGridNo;
-			ubDirection = 8; // don't loop
+			ubDirection = NUM_WORLD_DIRECTIONS; // don't loop
 		}
 
 		// if this sNextGridNo isn't out of bounds... but it never can be

Tactical/Soldier Control.h

@@ -415,7 +415,8 @@ enum
 #define BACKGROUND_FLAG_MAX	8					// number of flagged backgrounds - keep this updated, or properties will get lost!
 
 // some properties are hidden (forbid background in MP creation)
-#define BACKGROUND_HIDDEN_FLAGS					(BACKGROUND_NO_MALE|BACKGROUND_NO_FEMALE)
+// corruption property is not relevant in 1.13
+#define BACKGROUND_HIDDEN_FLAGS					(BACKGROUND_NO_MALE|BACKGROUND_NO_FEMALE|BACKGROUND_CORRUPTIONSPREAD)
 
 // anv: externalised taunts
 // taunt properties