From 8dc317c1367f367d0948342f8ffb436ccf24fb1a Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Tue, 26 Sep 2006 13:02:10 +0000
Subject: [PATCH] - bugfix: After loading a savegame the I.M.P. emails always
 name "Barry Unger". The problem was, that the I.M.P mail changes were not
 saved. ATTENTION: YOU HAVE TO START A NEW GAME, BECAUSE THE
 SAVEGAME-STRUCTURE CHANGED. IT IS NOT POSSIBLE TO LOAD AN OLDER SAVEGAME (AN
 ERROR WILL OCCUR)!!!!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@560 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 JA2.suo                        | Bin 197632 -> 197632 bytes
 JA2.vcproj                     |   2 +-
 Language Defines.h             |   4 ++--
 Laptop/email.h                 |   5 +++++
 SaveLoadGame.cpp               |   5 ++++-
 Tactical/Animation Control.cpp |   1 +
 Utils/_EnglishText.cpp         |   6 +++---
 Utils/_GermanText.cpp          |   8 ++++----
 8 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/JA2.suo b/JA2.suo
index af6fff784053eec9de5acb878b9d7a2d6691868b..aaacf37e5900c11022ba5474dd01e6ecbcc78c58 100644
GIT binary patch
delta 1920
zcmb7FUrbw782`T80%hEmKLy6BVh7COB3m77VIv5PnMpyZVd23+LPuLyK&Vj2L^C>L
z%%0GAWGDU!kr$KAsj!-$@ntA1>Rjetj1SI0Vxlp7AQ5#AS^b^cA}xtCo}1tO&i&3g
z-~aF2$QeCyMxX98+q&*wuIgR7%qAkb^ip)x>^9eI!Mqp<Q5y|VANeRqej20-dW8DP
zOV8kos0DbM8o&vH(?-MC5s1bthfP+tVJ(&z^19At=}P`DEJpQHTHn#=ZQaJ1;KYZ>
zwb?VXlD|Z~?K$&mA(1#O3hYEC3s!redN1f(iof(mLG-rmOX#`}EGwYY8M?$uo<~>W
zQY;W*yGK`?{M5a6kC?Z+L^%JNXtX{o!UY~Zck|ikN`bC5u|}i;Ccq4&0qH;nU;#1#
z9moRiK#>*H24n*{KrWC6+=+70EMIh-bZMc?=%~BhyXP+^`W^TKxCN-=3agkCj;tvj
z5CgVoB&O!JMT;&RFG5s1M8m=n@#DOM*Jp)HVs-x0j1V=_L99Rf%>i+0%_bI|#Zlko
zMU!rZ(Cm~bguiMPpSx>cyE3oei-nxz#pueFmMXb;58Gs?pB*ZZ5dSEDtQ1ew^T<Cl
zx4s6OU&MxUfYdd9eaCy4od;%s3&8up2f&BGG+=l-<E>#i*UJwigqKcy%VBxR%=L9%
z>PEF4M(V@BabO7F$H<9#8`@lbSXH~7)CtK&!0>Ec8e7=y!<=X<{b0JvsP0&7r$z{+
zF{Y2zYF~8JYU(>fkMo@TJXNCD8oJR0gJ^;t@YRMFl+)75Ts}6msXLlr<-hmMFl@j3
zj*ZUBgPhI1N3;vvq<$NVH(bKy%>g0`q;9|K?*9(wZaP8jXmlUKJ3y^)hI{1PBztGO
zEc~;{qT+_!#~W}qtn>F)Zk~P8!M|3^NG_MlvI=&~$YWf*ZHRUwOCda{1k|<~iZ;vB
z7Pe=P7>nyMSEW`e-((KRYh9c#rWexrq>+QgkGMo$?PS|}LCOv@`{a2u>U2Dv-){3m
zP#Cg}IzX+Y-evJz?8kbD9!C&^xaZXU7DUsin`{t{_TzjLRy}wIAR#EG^0$i5T!kDl
zOt_iO2aR4UmF^6FN|rQoL{9F2qn?L2Z)YowK*%5>=Z6AclG`zLUtuU}Q*I0S>Yv;p
z$8T^>iN`3ofMJn8=}@(5Ta0S6bXD@%vrgzi5X!b6H4N^Dfg6EU*;hl+;kbt7Pc-8|
z{yybjKf2@)%u?Ot!@LQc5Cnyjgj`RUsc31cndR09ZecYP9gi<Y&S`NU<ag~_p7oVP
zauxN<neBYTh)d=AFGIC-5P?;utk>^`2R|iFD_ZlvPv1<OR<y>jj!(#?DsHau8d+(9
zUX_z0c&p#phTi3b(~8!qlf4tUyhnCC!4CQ07`Mx;ZvHJzmCKNrS}5Q?qZGcr#kzba
igB|gDQ2!Vr7b>a}&wkoR2WaobUG@BOfZq*hlYawXUf`Yp

delta 1150
zcmZWoO>9(E6h7aZN1c|}H>E$*Qp#jfWeCPJ)ij2Lgw`-<S}Ps3pg`3bW~Q}68Jg)7
z!X%c$LNHN&a&3+-G%TB_3HTPXa8pUzq>x5d=z?fnm=I0eIHDrudG31%6TQiK_rC9Z
z=jWb#&g@xh_N;Yz!n9YX2j-8jE+Ig&W}T8bVD2#F*da1TFHx2Xl%|AykJ2cO(}W;X
zqKk?2Q=TSinu@fWjtQQpqT>eRfqJqZcyMK@i@7IiwEH(nm8=;f-tXMCY}8(@BU%xG
z+F&=;xI(CdvhA?yvrm`@!$j(oYH1=m7!*~GQuK`M9{%IUEzVtgS>kLK$P)QCj;b^!
ztmX&6L$KJCQ1Rw&RcT6C_5V{gf1`F?dRi4*5|;TNrBi9K3<oh6j=S+hw_(&crGb5^
z?)&2U4v78``BOyyYx!Hw_e9n-CgSQ{@Gn0vwQ=JxIx#YL1uv-BVi@4iFdkRQ#gDWm
zDu>Rw%LuB%jqPe?%~q??h?7}b4On9DZm7Ov@!F7=apl?#D<q1BDy37oKG?$zJuta%
zC%X7aAnrxxJthkL!4&G`DIUh|<ep(<tThR7TD<67*)s5<x^&3Ak{Lm3TIxPQUGltX
zd1~DRIpO*CoY;$ZdBH?qZ<lnzlypf-C@DH3l<HNK-WU{9-`O~o<Ud2NO5YTuqw+LX
z?p=o<)E9MI`Mn&P`MbTC*9GDE*YG+QG6+8=mDEe^U)-j14)fJdkt`>JxE%<t7lp2p
z?zD2z!mWBdSAMx2ziprEM1)87prbr9grxu{H{n@s8^RejdJyBtZc#6naDa#Ms6`up
zJ%$KI_(Bms@IpVH;;-I83LAYq;p69zp^<-HhOI64@n1QF&|b}Go$_v$l5bXKXk6}n
zM5;2$3njee^EY{X;}xjr^MkyY$NQnU5OuAOipex(IrOc>eUw{=Z;^Op!Ly@AtSX1i
zKI4GT_~|yzZFyU~P11{!Mpkw`%297<bz%h>=ai(D)oG>u0z~|4ggJQ{pXs`_^R|<6
z$MtFa&e3V~dQDZU-^`nPZTg1HdMkY&Sb@y4>qb2nykiD8`PT+1Y3(nV;FU2no;f^<
L^5Icq?vsB2Q9*RO

diff --git a/JA2.vcproj b/JA2.vcproj
index 23db1d90..e8b1b0fb 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 v1.13\ja2_debug_v1.13.502_2006_09_01.exe"
+				OutputFile="C:\Games\Jagged Alliance 2 DE\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 5c95c240..ed4e9cea 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 0aa09e3a..0206d155 100644
--- a/Laptop/email.h
+++ b/Laptop/email.h
@@ -193,6 +193,11 @@ 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;
+
 } SavedEmailStruct;
 
 
diff --git a/SaveLoadGame.cpp b/SaveLoadGame.cpp
index 71c5cf30..4c889ab9 100644
--- a/SaveLoadGame.cpp
+++ b/SaveLoadGame.cpp
@@ -3565,6 +3565,8 @@ BOOLEAN SaveEmailToSavedGame( HWFILE hFile )
 		SavedEmail.iFourthData = pEmail->iFourthData;
 		SavedEmail.uiFifthData = pEmail->uiFifthData;
 		SavedEmail.uiSixData = pEmail->uiSixData;
+		// WANNE NEW
+		SavedEmail.iCurrentIMPPosition = pEmail->iCurrentIMPPosition;
 
 
 		// write the email header to the saved game file
@@ -3666,7 +3668,8 @@ BOOLEAN LoadEmailFromSavedGame( HWFILE hFile )
 		pTempEmail->iFourthData = SavedEmail.iFourthData;
 		pTempEmail->uiFifthData = SavedEmail.uiFifthData;
 		pTempEmail->uiSixData = SavedEmail.uiSixData;
-
+		// WANNE NEW
+		pTempEmail->iCurrentIMPPosition = SavedEmail.iCurrentIMPPosition;
 
 		//add the current email in
 		pEmail->Next = pTempEmail;
diff --git a/Tactical/Animation Control.cpp b/Tactical/Animation Control.cpp
index 54219f27..806a53b7 100644
--- a/Tactical/Animation Control.cpp	
+++ b/Tactical/Animation Control.cpp	
@@ -3591,6 +3591,7 @@ UINT16 GetSoldierAnimationSurface( SOLDIERTYPE *pSoldier, UINT16 usAnimState )
 
 	if ( usAnimSurface != INVALID_ANIMATION_SURFACE )
 	{
+		// WANNE NEW 2
 		// Ensure that it's loaded!
 		if ( gAnimSurfaceDatabase[ usAnimSurface ].hVideoObject == NULL )
 		{
diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp
index 1dfe5ccc..a2c263af 100644
--- a/Utils/_EnglishText.cpp
+++ b/Utils/_EnglishText.cpp
@@ -181,12 +181,12 @@ UINT16 WeaponType[MAXITEMS][30] =
 {
 	L"Other",
 	L"Pistol",
-	L"Machine pistol",
-	L"Submachine gun",
+	L"MP",
+	L"SMG",
 	L"Rifle",
 	L"Sniper rifle",
 	L"Assault rifle",
-	L"Light machine gun",
+	L"LMG",
 	L"Shotgun",
 };
 
diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp
index f708d170..a228be8b 100644
--- a/Utils/_GermanText.cpp
+++ b/Utils/_GermanText.cpp
@@ -174,12 +174,12 @@ UINT16 WeaponType[][30] =
 {
 	L"Andere",
 	L"Pistole",
-	L"Maschinenpistole",
+	L"MP",
 	L"Schwere MP",
 	L"Gewehr",
-	L"Scharfschützengewehr",
-	L"Sturmgewehr",
-	L"Leichtes MP",
+	L"SSG",
+	L"SG",
+	L"LMG",
 	L"Schrotflinte",
 };