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
This commit is contained in:
Flugente
2014-02-25 20:10:38 +00:00
parent 4ba2976817
commit 8923608027
4 changed files with 56 additions and 6 deletions
+2 -2
View File
@@ -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