- Temporary removed the bugfix from version 560, because it is not such a big bugfix so that players need to start a new game. We should enable the bugfix when we make bigger changes to the savegame structure or make a new release (or update) public again. NOW LOADING OLDER SAVEGAMES WORKS JUST FINE AGAIN!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@561 3b4a5df2-a311-0410-b5c6-a8a6f20db521

JA2.vcproj

@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libexpatMT.lib mss32.lib winmm.lib smackw32.lib fmodvc.lib"
-				OutputFile="C:\Games\Jagged Alliance 2 DE\ja2_debug_v1.13.502_2006_09_01.exe"
+				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.502_2006_09_01.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"

Language Defines.h

@@ -3,8 +3,8 @@
 
 //ONLY ONE OF THESE CAN BE DEFINED AT A TIME!
 
-//#define ENGLISH
-#define GERMAN
+#define ENGLISH
+//#define GERMAN
 //#define RUSSIAN
 //#define DUTCH
 //#define POLISH

Laptop/email.h

@@ -194,9 +194,9 @@ typedef struct
 	BOOLEAN fRead;
 	BOOLEAN fNew;
 
-	// WANNE: A reference to the IMP position in the gMercProfiles array. 
-	// So we know which analyse email belongs to the imp
-	INT32		iCurrentIMPPosition;
+	// WANNE - SAVEGAME-STRUCTURE: Remove the comment, until we have bigger changes in the savegame structure
+	// BECAUSE A NEW GAME MUST BE STARTED! 
+	//INT32		iCurrentIMPPosition;
 
 } SavedEmailStruct;
 

SaveLoadGame.cpp

@@ -3565,8 +3565,11 @@ BOOLEAN SaveEmailToSavedGame( HWFILE hFile )
 		SavedEmail.iFourthData = pEmail->iFourthData;
 		SavedEmail.uiFifthData = pEmail->uiFifthData;
 		SavedEmail.uiSixData = pEmail->uiSixData;
-		// WANNE NEW
-		SavedEmail.iCurrentIMPPosition = pEmail->iCurrentIMPPosition;
+		
+
+		// WANNE - SAVEGAME-STRUCTURE: Remove the comment, until we have bigger changes in the savegame structure
+		// BECAUSE A NEW GAME MUST BE STARTED! 
+		//SavedEmail.iCurrentIMPPosition = pEmail->iCurrentIMPPosition;
 
 
 		// write the email header to the saved game file
@@ -3668,8 +3671,10 @@ BOOLEAN LoadEmailFromSavedGame( HWFILE hFile )
 		pTempEmail->iFourthData = SavedEmail.iFourthData;
 		pTempEmail->uiFifthData = SavedEmail.uiFifthData;
 		pTempEmail->uiSixData = SavedEmail.uiSixData;
-		// WANNE NEW
-		pTempEmail->iCurrentIMPPosition = SavedEmail.iCurrentIMPPosition;
+		
+		// WANNE - SAVEGAME-STRUCTURE: Remove the comment, until we have bigger changes in the savegame structure
+		// BECAUSE A NEW GAME MUST BE STARTED! 
+		//pTempEmail->iCurrentIMPPosition = SavedEmail.iCurrentIMPPosition;
 
 		//add the current email in
 		pEmail->Next = pTempEmail;