From c256b0faf824e37c265ed6a7d9ab09e875934388 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Tue, 26 Sep 2006 13:30:39 +0000
Subject: [PATCH] - 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.suo            | Bin 197632 -> 197632 bytes
 JA2.vcproj         |   2 +-
 Language Defines.h |   4 ++--
 Laptop/email.h     |   6 +++---
 SaveLoadGame.cpp   |  13 +++++++++----
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/JA2.suo b/JA2.suo
index aaacf37e5900c11022ba5474dd01e6ecbcc78c58..06e9935211ce9dc15676588ad8a5cac75db803f6 100644
GIT binary patch
delta 685
zcmZuvL1<G!5S`ilL=*CVY*P{qhNPfXM5|VtOGToBgc2}X+em3^Qd6uok|vf2G04YD
z0|lXeaSmQ0h#(ph4fwri6?^dz=t;yw(L<r&K_NFm>TIhPsRM6z_s#6g?9A#Vr(SZ_
z(u(!7@^&Uu&nnZKMWnC(!>OVDB?7!-*o_v=Z9k;}3^Ic9WQ4T^qusSlbpk*?Ou;2c
z!_|7om20-tn0msfFrG51<|~0GaCTC8q2M{;ZWmx-T1u(M?<gPfJIu>ATykTtdD@51
zj+6dK4AICiZlR9@qSbsbf-#HQRM+mv^%&tOrj7E1ml8=VQ!a%b@}%&dD-9_af<8z>
z9>yU0d`}oxttMN)BAr2YtmZLF;iK58<{<;4Fu|S|V2a)p@I2iw;`X++s`%-!Nj{Jz
zhDPvYl$Mt97A1yp2fZ)gfang9>jwJ%<9`4ReL0FnN~Ulp&5dJ(zQ@t&igU&s*BED=
zgvr&M`@2H`URbm=&;hWr(y_5Y>!k?TOAAG8sAF)2BgnpY!Z;-|*dP2S%C3!3%$_XP
zu<LK4-2!A_DSsxho`@%n*Wu7ZHdYN)^V+U?0CbO`X&!5y$q$mW&+%@a5s<&aHX{J;
z2<ftwIj~CgTN;lKw|;wFS)|xS^c!8x2vu(4CrX?}|6L!(u$OrD8DrLakoFZ&r|?hF
RCYwAs9mt{?$citwe*qvUq)q?;

delta 725
zcmY*WUr1A76hFV)R?hY(TNoK`ONd;toYT@-)|52_S74Y%tyJcyu_?_>G+nu#^r0lW
z#3ATCg367Bdo}Q(puiq_tA`$X>P6_OAlJF~me6<jec!p~JHK<z{e6WcYhlS+Oq<N3
z?#=d8Ib&L^QPP9uUsgNJq%Hn90jKJ*o6Nia`&2{r4VzU$mncU`N>f&~IvUGej>#X5
zB?-R}ycE0=tO$yNt!lNpRT?{mRTC~N&LavzqS`86?N;8#x|K?5C%!q+Um0jXsh1!A
zM2wfepxIWaHxjjTneWv=<-&6%R=Iu+Q#)*%Hse-1&uX`+$8~7o*abAOcL77S&87!R
zEm5`V=1dMQJmp&{yk8v$6n-;}ULN_5dcKpxUPO2!k54@6fk)$xph>6jvjrSFU?ylI
zkL&IB({@>_o}=_Zb$yN^&pks3a!VS0+&2uDB}`+Y(s8=UYqJ>UCo^!src=Bj%u^2q
zC_?9`gW6?pB_H+bew%o$Vqx-=PfcwdKA5M|bYA4nQd}6C><RJDP@dxIfMp_)q)E9+
z)3l73pcu_c+bQu9l98u*>XgcDvIqXcM<>Pi3;uP|x_63oXgvjnMfAuCi3Tam%QI+z
z-B9v%MU)JJ{YB*{znjA#JMO{;hapH8)X*^zMD1Vq>UyZrb-N`Y(<NoHESH+#)L2*8
zoq+{=wppG?lyBd_{aqJDI{7PJn?u}4sxuk~w0HWzq2J0ry~3hYsJJuA*GGQ<*u%9n

diff --git a/JA2.vcproj b/JA2.vcproj
index e8b1b0fbd..23db1d90d 100644
--- a/JA2.vcproj
+++ b/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\"
diff --git a/Language Defines.h b/Language Defines.h
index ed4e9cead..5c95c2406 100644
--- a/Language Defines.h	
+++ b/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
diff --git a/Laptop/email.h b/Laptop/email.h
index 0206d1555..cd26f97f3 100644
--- a/Laptop/email.h
+++ b/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;
 
diff --git a/SaveLoadGame.cpp b/SaveLoadGame.cpp
index 4c889ab9c..ae55e7cf9 100644
--- a/SaveLoadGame.cpp
+++ b/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;