From cdf263093a67d45012b2508f51688d55d924a23b Mon Sep 17 00:00:00 2001 From: Wanne Date: Fri, 13 Oct 2006 12:42:10 +0000 Subject: [PATCH] - 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 | 8 ++++---- JA2.suo | Bin 197632 -> 197632 bytes JA2.vcproj | 4 ++-- Laptop/email.h | 2 +- SaveLoadGame.cpp | 4 ++-- Utils/_DutchText.cpp | 8 ++++---- Utils/_EnglishText.cpp | 12 ++++++------ Utils/_FrenchText.cpp | 14 +++++++------- Utils/_PolishText.cpp | 8 ++++---- builddefines.h | 2 +- 10 files changed, 31 insertions(+), 31 deletions(-) diff --git a/GameVersion.cpp b/GameVersion.cpp index bdb90cca..03c83a44 100644 --- a/GameVersion.cpp +++ b/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; diff --git a/JA2.suo b/JA2.suo index 446cb3201eef11f721eca9e7fbe8f288b43b1c97..e9b33e8dd43050adfad35f7fc45691f6d3a33bf8 100644 GIT binary patch delta 1056 zcmZ`&QD{_06uoEO%Vv|zzU;bc7qvAsGX9^+d6!)cFJ8L~Z;p^qs?LweMEI9wgu zUL|#TP=iM)OD7CmqlW{!^GFFiqN}Wd4Z+(qsQV1Tuz|e6>i4Y>HR;;0tm|B^Nz3RO zuny)nq`4=W3J5_|PW)g)uM9oYQx?{M%_GqwzcsambG2z{KhxqZ*M>#Ks%9;vht_}b zQ^U!WSg^fQy?Zml5?q{#i-+*;%}m6!t^M3x*v)p~zsV)oYJMA%YUFn~JiNG#M;|%7 z)ExH)Z!THVD2=Qg_r&hvzLJjR;-b`ElTr8dbG+qW<<`kAbm|j6Hz#QJ*L8i;)M}y+ zQT6aH8hNe|RM&wX4ImEkf3eXGH6Oq(C1&ySbUC2@i6f=lA4R|4lR(bOOS~I2H{z*SKPNGc zi&vA7`54kT=J&<$sg;l8OMjpV3sCMDdezcPs8g#gsPk7hA}Lh=W_+(wmB{(IAX38r z)4_nHuGV78pKC){sDYS}`5l^M?;G&m@o@(4Rpg`SEjgY37CV)`&Qq%KxF*+@)F}4@ zp$)h%+Cv#F&xDyf)mRYxytazbQWMdr8cJX&m|a+mT;4@fD)R&Oa55!Je=z*lCN3tf z@cu%lTDQtPDDF!(@rA#)TOHKlebEjveFiblec82NcH g^eT0eiUjeRQCoTCGz3)735=gTe+mBiOJexo|4;BrIsgCw delta 1412 zcmZ8hT}&KR6u#f=?6APh{_rmXoluQ}O^bw7Q!4?Xt!|nEp+z4Wfr6=(jU})~K%$E^ z+SsN7x83tv8e>UHlcv*jcq>-g7;25FKG>)U4?Y+lnwpSU`?GlN?$DCG$+_pucfRv; z@7#M6N6o}h^FmAyE?+s^R(j_;e1gXjXH1_49ype<)vyp`Xw@4s5_m?&&4h7`!G^D# z`(^+k2tWvp5tBv8NU+qe3}qF{rr@alpoBjrWU;&ztS#zP33rQLF(~5VFwa7C%5bP` zd#4KD$KW9m6T=EF;At;2`_f<^TQLQz1Up1O^HhQ%1v&kpZl8rpwk;ObZo1c%f_5|C z10I9%!gf=A6s=<#1~1@E$oqv+xmZ}|53|pfqeV-y#d=Z3i`&geRvKreIIPuZ9Oh%u zSyG%+Ne>q?wJNo4XXS?3 zKv$+zrRq$+yHF{T9X={hm=`sd(5fFTq~#z*_1)M@lhv@@?>C}Ov;O3KYAD@LkuLl}%TJ?(!j&kqp5qgz zhSD$4L@i!Qns_~+PSDyOxN#H5L8ogGAUltz$uM@iiD&Vv&w7{+7DDM36)tJ=ckQ^f zkN=b!O0UPqJzVKMPx$m!4Nhkw>%4}Pe&sP^JXwx*Ot>B8_|Ql80HT>S#B7vkbD)La z&_s6wc$;F)Yrg0PRJ+kCTtyaW&3QGHeuMtmvbG~C!W!|MO7~?uKk}SP8`S%*7wK{z zt(tYhTb{ zEn4Z$JO=2|E#yO|=2=vsk$PrvlYSh7O}S^#m3PSZ9`e*#@Mj2HGX#4Wft+rBTt>xk z@(jA4@Qe&^r{di%v_(t$v5AQT>E~x4o1U|-?roYrh9Z~i{+mlp1{RWYe3E}Lu$iWt d(I6)WbYp+|9ZSw*;w-*|@dYly#U*XE?SI<|nUVki diff --git a/JA2.vcproj b/JA2.vcproj index 23db1d90..ecd1a69a 100644 --- a/JA2.vcproj +++ b/JA2.vcproj @@ -43,7 +43,7 @@ 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; diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index ebb38bf4..34e40961 100644 --- a/Utils/_DutchText.cpp +++ b/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?", diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 550bcc63..7367da61 100644 --- a/Utils/_EnglishText.cpp +++ b/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 saved game files may be invalidated. Do you want them all deleted?", + 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?", //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?", diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index 7732ef37..6cc11eac 100644 --- a/Utils/_FrenchText.cpp +++ b/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"Les fichiers de sauvegarde sont peut-être altérés. Voulez-vous les effacer ?", + 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?", //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"Voulez-vous charger la sauvegarde #%d ?", + L"Etes-vous sûr de vouloir écraser 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, diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index 19ef4ebd..8ae7c98b 100644 --- a/Utils/_PolishText.cpp +++ b/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?", diff --git a/builddefines.h b/builddefines.h index e8ca6ecd..4c786c09 100644 --- a/builddefines.h +++ b/builddefines.h @@ -9,7 +9,7 @@ // Release version of the editor! // Normal test version -// #define JA2TESTVERSION +//#define JA2TESTVERSION // Debug version of the editor!