- build of the new release & update (602)

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

GameVersion.cpp

@@ -13,7 +13,7 @@
 #ifdef JA2BETAVERSION
 
 //BETA/TEST BUILD VERSION
-INT16		zVersionLabel[256]		= { L"Map Editor v1.13.592" }; 
+INT16		zVersionLabel[256]		= { L"Map Editor v1.13.602" }; 
 
 #elif defined CRIPPLED_VERSION
 
@@ -23,12 +23,12 @@ INT16		zVersionLabel[256]		= { L"Beta v. 0.98" };
 #else
 
 	//RELEASE BUILD VERSION  
-	INT16		zVersionLabel[256]		= { L"Release v1.13.592" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.602" };
 
 
 #endif
 
-INT8		czVersionNumber[16]	= { "Build 06.10.05" };
+INT8		czVersionNumber[16]	= { "Build 06.10.13" };
 INT16		zTrackingNumber[16]	= { L"Z" };
 	
 
@@ -36,6 +36,6 @@ INT16		zTrackingNumber[16]	= { L"Z" };
 //		Keeps track of the saved game version.  Increment the saved game version whenever 
 //	you will invalidate the saved game file
 
-#define			SAVE_GAME_VERSION					99
+#define			SAVE_GAME_VERSION					100 // 99
 
 const	UINT32	guiSavedGameVersion = SAVE_GAME_VERSION;

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 v1.13\ja2_debug_602.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
@@ -546,7 +546,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib"
-				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.502_2006_09_01.exe"
+				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_602.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"

Laptop/email.h

@@ -196,7 +196,7 @@ typedef struct
 
 	// WANNE - SAVEGAME-STRUCTURE: Remove the comment, until we have bigger changes in the savegame structure
 	// BECAUSE A NEW GAME MUST BE STARTED! 
-	//INT32		iCurrentIMPPosition;
+	INT32		iCurrentIMPPosition;
 
 } SavedEmailStruct;
 

SaveLoadGame.cpp

@@ -3569,7 +3569,7 @@ BOOLEAN SaveEmailToSavedGame( HWFILE hFile )
 
 		// 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;
+		SavedEmail.iCurrentIMPPosition = pEmail->iCurrentIMPPosition;
 
 
 		// write the email header to the saved game file
@@ -3674,7 +3674,7 @@ BOOLEAN LoadEmailFromSavedGame( HWFILE hFile )
 		
 		// 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;
+		pTempEmail->iCurrentIMPPosition = SavedEmail.iCurrentIMPPosition;
 
 		//add the current email in
 		pEmail->Next = pTempEmail;

Utils/_DutchText.cpp

@@ -3319,18 +3319,18 @@ STR16			zSaveLoadText[] =
 	//is used for the final version.  Please don't modify the "#ifdef JA2BETAVERSION" or the "#else" or the "#endif" as they are
 	//used by the compiler and will cause program errors if modified/removed.  It's okay to translate the strings though.
 #ifdef JA2BETAVERSION
-	L"Save version has changed.  Please report if there any problems.  Continue?",
+	L"Save version has changed. Please report if there any problems. Continue?",
 #else
-	L"Attempting to load an older version save.  Automatically update and load the save?",
+	L"Attempting to load an older version save. Automatically update and load the save?",
 #endif
 
 	//Translators, the next two strings are for the same thing.  The first one is for beta version releases and the second one
 	//is used for the final version.  Please don't modify the "#ifdef JA2BETAVERSION" or the "#else" or the "#endif" as they are
 	//used by the compiler and will cause program errors if modified/removed.  It's okay to translate the strings though.
 #ifdef JA2BETAVERSION
-	L"Save version and game version have changed.  Please report if there are any problems.  Continue?",
+	L"Save version and game version have changed. Please report if there are any problems. Continue?",
 #else
-	L"Attempting to load an older version save.  Automatically update and load the save?",
+	L"Attempting to load an older version save. Automatically update and load the save?",
 #endif
 
 	L"Weet je zeker dat je het spel in slot #%d wil overschrijven?",

Utils/_EnglishText.cpp

@@ -3312,25 +3312,25 @@ STR16			zSaveLoadText[] =
 	L"Loaded the game successfully",
 	L"ERROR loading the game!",
 
-	L"The game version in the saved game file is different then the current version.  It is most likely safe to continue.  Continue?",
+	L"The game version in the saved game file is different then the current version. It is most likely safe to continue.  Continue?",
-	L"The saved game files may be invalidated.  Do you want them all deleted?",
+	L"The saved game files may be invalidated. Do you want them all deleted?",
 
 	//Translators, the next two strings are for the same thing.  The first one is for beta version releases and the second one
 	//is used for the final version.  Please don't modify the "#ifdef JA2BETAVERSION" or the "#else" or the "#endif" as they are
 	//used by the compiler and will cause program errors if modified/removed.  It's okay to translate the strings though.
 #ifdef JA2BETAVERSION
-	L"Save version has changed.  Please report if there any problems.  Continue?",
+	L"Save version has changed. Please report if there any problems. Continue?",
 #else
-	L"Attempting to load an older version save.  Automatically update and load the save?",
+	L"Attempting to load an older version save. Automatically update and load the save?",
 #endif
 
 	//Translators, the next two strings are for the same thing.  The first one is for beta version releases and the second one
 	//is used for the final version.  Please don't modify the "#ifdef JA2BETAVERSION" or the "#else" or the "#endif" as they are
 	//used by the compiler and will cause program errors if modified/removed.  It's okay to translate the strings though.
 #ifdef JA2BETAVERSION
-	L"Save version and game version have changed.  Please report if there are any problems.  Continue?",
+	L"Save version and game version have changed. Please report if there are any problems. Continue?",
 #else
-	L"Attempting to load an older version save.  Automatically update and load the save?",
+	L"Attempting to load an older version save. Automatically update and load the save?",
 #endif
 
 	L"Are you sure you want to overwrite the saved game in slot #%d?",

Utils/_FrenchText.cpp

@@ -3301,16 +3301,16 @@ STR16			zSaveLoadText[] =
 	L"Chargement réussi",
 	L"ERREUR lors du chargement !",
 
-	L"La version de la sauvegarde est différente de celle du jeu. Désirez-vous continuer ?",
+	L"La version de la sauvegarde est différente de celle du jeu. Désirez-vous continuer?",
-	L"Les fichiers de sauvegarde sont peut-être altérés. Voulez-vous les effacer ?",
+	L"Les fichiers de sauvegarde sont peut-être altérés. Voulez-vous les effacer?",
 
 	//Translators, the next two strings are for the same thing.  The first one is for beta version releases and the second one
 	//is used for the final version.  Please don't modify the "#ifdef JA2BETAVERSION" or the "#else" or the "#endif" as they are
 	//used by the compiler and will cause program errors if modified/removed.  It's okay to translate the strings though.
 #ifdef JA2BETAVERSION
-	L"La version de la sauvegarde a changé. Désirez-vous continuer ?",
+	L"La version de la sauvegarde a changé. Désirez-vous continuer?",
 #else
-	L"Tentative de chargement d'une sauvegarde de version précédente. Voulez-vous effectuer une mise à jour ?",
+	L"Tentative de chargement d'une sauvegarde de version précédente. Voulez-vous effectuer une mise à jour?",
 #endif
 
 	//Translators, the next two strings are for the same thing.  The first one is for beta version releases and the second one
@@ -3319,11 +3319,11 @@ STR16			zSaveLoadText[] =
 #ifdef JA2BETAVERSION
 	L"La version de la sauvegarde a changé. Désirez-vous continuer?",
 #else
-	L"Tentative de chargement d'une sauvegarde de version précédente. Voulez-vous effectuer une mise à jour ?",
+	L"Tentative de chargement d'une sauvegarde de version précédente. Voulez-vous effectuer une mise à jour?",
 #endif
 
-	L"Etes-vous sûr de vouloir écraser la sauvegarde #%d ?",
+	L"Etes-vous sûr de vouloir écraser la sauvegarde #%d?",
-	L"Voulez-vous charger la sauvegarde #%d ?",
+	L"Voulez-vous charger la sauvegarde #%d?",
 
 
 	//The first %d is a number that contains the amount of free space on the users hard drive,

Utils/_PolishText.cpp

@@ -3301,18 +3301,18 @@ STR16			zSaveLoadText[] =
 	//is used for the final version.  Please don't modify the "#ifdef JA2BETAVERSION" or the "#else" or the "#endif" as they are
 	//used by the compiler and will cause program errors if modified/removed.  It's okay to translate the strings though.	
 #ifdef JA2BETAVERSION
-	L"Nieprawidłowa wersja zapisu gry.  W razie problemów prosimy o raport.  Kontynuować?",
+	L"Nieprawidłowa wersja zapisu gry. W razie problemów prosimy o raport. Kontynuować?",
 #else
-	L"Próba odczytu starszej wersji zapisu gry.  Zaktualizować ten zapis i odczytać grę?",
+	L"Próba odczytu starszej wersji zapisu gry. Zaktualizować ten zapis i odczytać grę?",
 #endif
 
 	//Translators, the next two strings are for the same thing.  The first one is for beta version releases and the second one
 	//is used for the final version.  Please don't modify the "#ifdef JA2BETAVERSION" or the "#else" or the "#endif" as they are
 	//used by the compiler and will cause program errors if modified/removed.  It's okay to translate the strings though.
 #ifdef JA2BETAVERSION
-	L"Nieprawidłowa wersja zapisu gry.  W razie problemów prosimy o raport.  Kontynuować?",
+	L"Nieprawidłowa wersja zapisu gry. W razie problemów prosimy o raport. Kontynuować?",
 #else
-	L"Próba odczytu starszej wersji zapisu gry.  Zaktualizować ten zapis i odczytać grę?",
+	L"Próba odczytu starszej wersji zapisu gry. Zaktualizować ten zapis i odczytać grę?",
 #endif
 
 	L"Czy na pewno chcesz nadpisaæ grê na pozycji %d?",

builddefines.h

@@ -9,7 +9,7 @@
 
 // Release version of the editor!
 // Normal test version
-// #define JA2TESTVERSION
+//#define JA2TESTVERSION
 
 
 // Debug version of the editor!