From 8cfdddddc43d541bf10d80056fbe14dfe2fb669a Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Mon, 5 Jan 2015 00:39:35 +0000
Subject: [PATCH] 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
---
 Tactical/Soldier Create.cpp | 46 ++++++++++++++++---------------------
 Tactical/Soldier Create.h   | 21 +++++++++++++++++
 2 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/Tactical/Soldier Create.cpp b/Tactical/Soldier Create.cpp
index 8e7edca2..6c95b85b 100644
--- a/Tactical/Soldier Create.cpp	
+++ b/Tactical/Soldier Create.cpp	
@@ -1393,15 +1393,7 @@ BOOLEAN TacticalCopySoldierFromProfile( SOLDIERTYPE *pSoldier, SOLDIERCREATE_STR
 	return( TRUE );
 }
 
-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
-};
-
-INT32 ChooseHairColor( SOLDIERTYPE *pSoldier, INT32 skin )
+INT32 ChooseHairColor( UINT8 usBodyType, INT32 skin )
 {
 	INT32 iRandom;
 	INT32 hair = 0;
@@ -1429,11 +1421,11 @@ INT32 ChooseHairColor( SOLDIERTYPE *pSoldier, INT32 skin )
 			else
 			{
 				hair = WHITEHEAD;
-				if( pSoldier->ubBodyType == REGFEMALE ||
-					pSoldier->ubBodyType == MINICIV ||
-						pSoldier->ubBodyType == DRESSCIV ||
-						pSoldier->ubBodyType == HATKIDCIV ||
-						pSoldier->ubBodyType == KIDCIV )
+				if ( usBodyType == REGFEMALE ||
+					 usBodyType == MINICIV ||
+					 usBodyType == DRESSCIV ||
+					 usBodyType == HATKIDCIV ||
+					 usBodyType == KIDCIV )
 				{
 					hair = Random( NUMHEADS - 1 ) + 1;
 				}
@@ -1452,11 +1444,11 @@ INT32 ChooseHairColor( SOLDIERTYPE *pSoldier, INT32 skin )
 			else
 			{
 				hair = WHITEHEAD;
-				if( pSoldier->ubBodyType == REGFEMALE ||
-					pSoldier->ubBodyType == MINICIV ||
-						pSoldier->ubBodyType == DRESSCIV ||
-						pSoldier->ubBodyType == HATKIDCIV ||
-						pSoldier->ubBodyType == KIDCIV )
+				if ( usBodyType == REGFEMALE ||
+					 usBodyType == MINICIV ||
+					 usBodyType == DRESSCIV ||
+					 usBodyType == HATKIDCIV ||
+					 usBodyType == KIDCIV )
 				{
 					hair = Random( 2 ) + 1;
 				}
@@ -1470,11 +1462,11 @@ INT32 ChooseHairColor( SOLDIERTYPE *pSoldier, INT32 skin )
 			else
 			{
 				hair = WHITEHEAD;
-				if( pSoldier->ubBodyType == REGFEMALE ||
-					pSoldier->ubBodyType == MINICIV ||
-						pSoldier->ubBodyType == DRESSCIV ||
-						pSoldier->ubBodyType == HATKIDCIV ||
-						pSoldier->ubBodyType == KIDCIV )
+				if ( usBodyType == REGFEMALE ||
+					 usBodyType == MINICIV ||
+					 usBodyType == DRESSCIV ||
+					 usBodyType == HATKIDCIV ||
+					 usBodyType == KIDCIV )
 				{
 					hair = BLACKHEAD;
 				}
@@ -1484,13 +1476,15 @@ INT32 ChooseHairColor( SOLDIERTYPE *pSoldier, INT32 skin )
 			AssertMsg( 0, "Skin type not accounted for." );
 			break;
 	}
-	if( pSoldier->ubBodyType == CRIPPLECIV )
+
+	if ( usBodyType == CRIPPLECIV )
 	{
 		if( Chance( 50 ) )
 		{
 			hair = WHITEHEAD;
 		}
 	}
+
 	return hair;
 }
 
@@ -1508,7 +1502,7 @@ void GeneratePaletteForSoldier( SOLDIERTYPE *pSoldier, UINT8 ubSoldierClass, UIN
 	skin = (INT8)Random( NUMSKINS );
 
 	//Choose hair color which uses the skin color to limit choices
-	hair = ChooseHairColor( pSoldier, skin );
+	hair = ChooseHairColor( pSoldier->ubBodyType, skin );
 
 	if ( pSoldier->usSoldierProfile )
 	{
diff --git a/Tactical/Soldier Create.h b/Tactical/Soldier Create.h
index aa2a9ebc..7172cb22 100644
--- a/Tactical/Soldier Create.h	
+++ b/Tactical/Soldier Create.h	
@@ -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
\ No newline at end of file