Merged revision(s) 7699 from branches/ja2_source_official_2014:

Merged revision(s) 7688 from branches/Flugente/BaseTable:
- moved hair & skin enums to header
- moved hair colour choosing function to header


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7703 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2015-01-05 00:39:35 +00:00
parent 72809ac09f
commit 8cfdddddc4
2 changed files with 41 additions and 26 deletions
+21
View File
@@ -30,6 +30,25 @@ class _OLD_SOLDIERCREATE_STRUCT;//dnl ch42 250909
//Total 148
#define MAX_INDIVIDUALS TOTAL_SOLDIERS
enum
{
PINKSKIN,
TANSKIN,
DARKSKIN,
BLACKSKIN,
NUMSKINS
};
enum
{
WHITEHEAD,
BLACKHEAD, //black skin (only this line )
BROWNHEAD, //dark skin (this line plus all above)
BLONDEHEAD,
REDHEAD, //pink/tan skin (this line plus all above )
NUMHEADS
};
//Kris: SERIALIZING INFORMATION
//All maps must have:
// -MAPCREATE_STRUCT
@@ -536,4 +555,6 @@ BOOLEAN TranslateArrayFields(void* out, const void* inp, int len, int cmd);
void ResetNumSquadleadersInArmyGroup( void ); // added by SANDRO
BOOLEAN AssignTraitsToSoldier( SOLDIERTYPE *pSoldier, SOLDIERCREATE_STRUCT *pCreateStruct ); // Added a function to add traits to soldiers - SANDRO
INT32 ChooseHairColor( UINT8 usBodyType, INT32 skin );
#endif