From ef59f6e415e1f0734d97e66c2351f4ea019d83d7 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Mon, 30 May 2011 01:42:12 +0000
Subject: [PATCH] - Reverted the fix to set the correct camo face in the save
 load method, cause I am not exactly sure if that also leads to the merc faces
 bugs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4461 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 SaveLoadGame.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/SaveLoadGame.cpp b/SaveLoadGame.cpp
index 4b8af925..b421796c 100644
--- a/SaveLoadGame.cpp
+++ b/SaveLoadGame.cpp
@@ -4996,6 +4996,9 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 			AddEmail(MERC_INTRO, MERC_INTRO_LENGTH, SPECK_FROM_MERC, GetWorldTotalMin( ), -1, -1 );
 	}
 
+	// WANNE: I disabled that for now, because I am not sure if this works like intended
+	// We got some problems with the merc portraits, so if disabled we are on the safe side.
+	/*
 	// CHRISL: To set camo faces correctly from the start
 	for( UINT16 cnt=0; cnt< CODE_MAXIMUM_NUMBER_OF_PLAYER_MERCS; cnt++)
 	{
@@ -5010,6 +5013,7 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 			}
 		}
 	}
+	*/
 
 	// ATE: Patch? Patch up groups.....( will only do for old saves.. )
 	UpdatePersistantGroupsFromOldSave( guiCurrentSaveGameVersion );