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 -1
View File
@@ -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