- 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.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\"

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

@@ -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;
 
 

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;

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 )
 		{

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",
 };
 

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",
 };