From 7286d2badd0b7f813fec03f077523877cb77fb60 Mon Sep 17 00:00:00 2001
From: lalien <lalien@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Wed, 19 Apr 2006 18:55:16 +0000
Subject: [PATCH] Source v1.13 Mod High Resolution version from 2006-04-19

*********************************************************
*	2006/04/19					*
*	Madd_Mugsy					*
*	Developed in VS 2003				*
*********************************************************

- Restored the ?accurate? and ?inaccurate? strings that Rowa21 overwrote ;)
- IMP.dat file changed to save a different file for each IMP
- Different existing IMPs can be loaded by typing their names in the IMP webpage

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@28 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 GameVersion.cpp                               |   2 +-
 JA2.sln                                       |  10 +++++-----
 JA2.suo                                       | Bin 69120 -> 72704 bytes
 JA2.vcproj                                    |   2 +-
 Laptop/IMP Begin Screen.cpp                   |   2 +-
 Laptop/IMP Confirm.cpp                        |  17 +++++++++++++----
 Laptop/IMP Confirm.h                          |   3 ++-
 Laptop/IMP HomePage.cpp                       |   7 ++++---
 .../Standard Gaming Platform.vcproj           |   6 ++++--
 Utils/_EnglishText.cpp                        |   6 ++++--
 Utils/_GermanText.cpp                         |   2 ++
 11 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/GameVersion.cpp b/GameVersion.cpp
index 02919946..abfcee93 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -28,7 +28,7 @@ INT16		zVersionLabel[16]		= { L"Beta v. 0.98" };
 
 #endif
 
-INT8		czVersionNumber[16]	= { "Build 04.15.06" };
+INT8		czVersionNumber[16]	= { "Build 04.19.06" };
 INT16		zTrackingNumber[16]	= { L"Z" };
 	
 
diff --git a/JA2.sln b/JA2.sln
index e37dbaab..7e397a60 100644
--- a/JA2.sln
+++ b/JA2.sln
@@ -33,14 +33,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Utils", "Utils\Utils.vcproj
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ja2", "JA2.vcproj", "{32A550A8-FEBD-4F8D-8D62-6F97C63F83DA}"
 	ProjectSection(ProjectDependencies) = postProject
-		{F10032C4-A6E5-44F7-A9BC-B76C46BA72D5} = {F10032C4-A6E5-44F7-A9BC-B76C46BA72D5}
-		{E0E16C88-C352-4C37-AC27-BFF3FDF18E82} = {E0E16C88-C352-4C37-AC27-BFF3FDF18E82}
+		{2124B612-013E-492D-911C-B5737D60EEDF} = {2124B612-013E-492D-911C-B5737D60EEDF}
 		{33CD085A-A03E-4D2C-970A-D69CD5466806} = {33CD085A-A03E-4D2C-970A-D69CD5466806}
+		{1D052886-AE6B-437A-BE0C-D074CA940818} = {1D052886-AE6B-437A-BE0C-D074CA940818}
+		{E0E16C88-C352-4C37-AC27-BFF3FDF18E82} = {E0E16C88-C352-4C37-AC27-BFF3FDF18E82}
+		{97E691B8-7A39-4E86-B69A-BD6BD5C31F32} = {97E691B8-7A39-4E86-B69A-BD6BD5C31F32}
+		{F10032C4-A6E5-44F7-A9BC-B76C46BA72D5} = {F10032C4-A6E5-44F7-A9BC-B76C46BA72D5}
 		{D76119D7-B5EB-4F61-BFB9-F582B06F889B} = {D76119D7-B5EB-4F61-BFB9-F582B06F889B}
 		{4D4A4AF3-63D1-4C4B-81B5-3EFB3BD574F2} = {4D4A4AF3-63D1-4C4B-81B5-3EFB3BD574F2}
-		{2124B612-013E-492D-911C-B5737D60EEDF} = {2124B612-013E-492D-911C-B5737D60EEDF}
-		{1D052886-AE6B-437A-BE0C-D074CA940818} = {1D052886-AE6B-437A-BE0C-D074CA940818}
-		{97E691B8-7A39-4E86-B69A-BD6BD5C31F32} = {97E691B8-7A39-4E86-B69A-BD6BD5C31F32}
 	EndProjectSection
 EndProject
 Global
diff --git a/JA2.suo b/JA2.suo
index e25ef578594db3dbe3731581c66242fd71be388f..07b589185e97c44e6b557116f523dae43def2be5 100644
GIT binary patch
delta 4780
zcmdUzYiv|S6o6;;#kSn;(r#N?ps?jBrIfy<AdhwdODVAgi2i6onzr;|Ep@w~g_UiU
z_&|O@CuKvF1c*_S;v=l0{!k;d#6XOiC_nr`AU+^5(L@jdf%?s*E0hBMplib3e0R=0
zb9eUMGv}N+vz@QoIzP6(-(qu#tWTV$YL7{);Ik{T*>*&xUmqA4m~9av36%$uAqCDx
z);fCSm>Fk(?S1CMzRKNMSL4oEw>F2n44JDIJ6k+nv04PgMo}l4#0KFNRl*<n+$pUp
z*JhhvEgD3PcuLfZc2O<LkOLeoTzkcOZuir!<coD2T00wR&;~@K8W_DKLAZE?3Bc10
zsBdjkRlwLLPev{qane0XNGZg#um=iMqRTVxFt2a|()f;kz4wqm1!YkSU0ZD9QxUsV
z3U6q2(%sCj<<qun{h2)}GZ6JpR-$j?DK>CMWpG-{WfKqCt`#cNoi?jo+iDGW)|y?l
zNG-Zk53tm<haSMMRgpUPI%|T=Ku&;v-{wM6l`(oy5mnmVC~T_3v%=6SJrU6^$1l9-
zSVLX$RH!~ru6+!B->Ht|<I1-$PX$t{4BKskMJ}WmmXO2(7O;X1=70l6ffM2&9!7%!
z3E%=ZjDbW*0uLlZ3Z%kVNP~132jgJ^WWYq21YU~>iA;paFa@T<G?)%E;31d^SuhK-
zp$Kwd0pvm+<U;`z!a^v9hhZ+1z&w}_kAU`O%_8K*77SX7PzFBTxvS><p>cs+$2qL&
zjE`)taMh&!i2M`$4EmdPeIu>f*E@CoA1Kem1^5##!e4L+F2fc08?M4NxDEp#EJE%7
zB0Z9JurXD-RM(M{iN^BQ_5PZMruINnt#&1$8jns$+=}26^N5i;T&7l3tJmT)e1sBL
z&BTQEFdacR{59IH6L}m3VjX=O2thyh)pM0A3egwQ7AtjhLE_u78a@29U1oOob*r4d
zthshG9C-o#87r)|$F1?&b#VkKt(~TN@YFoHDEMW|Cc8FJKwau9SN?D2s;$>t>a=%a
zr0&>htLgfQ+|Cr3fp7l-d!ADr$1Bv)iUr*#%AGn)qP>y8i5-QWRbC<9jFBBz^)GUF
z$7t-m{WD`Y_B1Ja+%hxo8pe7ao4o+r;6>0L{u1rW@Cs~)S78TSkI1yIrCtkSX4LQd
zXQ>bRliabIG{z6VVVB80$#P=&uw71e{}!7m>?xIRxevu`Y){xJWijFKZft%+$8o7g
zC#)F$z@s;3;qb86NLO9OOG|=77T)S1S2<!6>8))rB?ggiOP8S$NS9`jve8`U>yU3P
z1FFSxN|h?%73CybUD8ys;5X3bn9tP~5<!kFVhMS7DfzdQ4D1ud)HG$}=ps>qR7j7`
z&9k{Gqc0b!fTP&#&!-mgK`G>m=a`N>ij!MXDeLLoQz=WoUv`hLd_b(|!-}mGflbWl
zQ&Ag=phX0C8?xM~ORi{k|0rO{9WpfHwk;?eVqJ=qyIYr~YP(e4WtB1*4%ua%`wkxH
z8vzeAm(<V`xLPGE`5Mzm9k^aA?qAROMoHOm(_k_1xq>-E4MXL2FT(^MAg?RKhz<B$
zD{;J<xb<_5Swk_k=MXQW{2gvgBU%r!^!|TdrmMylbE8s^A-sdhRfpt_9a=zipwkJi
zF&4RP&d}t>o?y6PZrbIfRBc|Oucu4q^>oU`u?j$z^3t+pgEm-6if{cd-}tJxFzNTt
z-Z`arqa~!RgW%D-QO6QC5p5Rba;3)Us%k$t&5nym6Q%B0fy6YJ`)1nvD)z%?q@1L7
zK4}X(9WvWJe3c!MEk(H0As=%e7`B9GG~LHSHzY*Z72eAeS|6Z%bNebc7)TW(S0$)K
vXLhpw%VCQ4BtB7h)Ey(TBJFj^k~_`!NDW?OZcwJF?1bd-PD4&VkR|^Cu63D<

delta 1212
zcmZ`&TS!!45T0?*uDf;4uI|lC7uVFxTj){{QK_w!u0{&_CWx#S=BDBWT*+9YM+0@#
zLlF@b^k5I-A@VhEh(gqhMK9T1@U2#;K)3l<BzL2M`Olnh=FH`r{{*L{;5}*5FPVqb
zsh5?F3#bEtV87NU&0xxR1lS6P!&b&@taerh>u0UbFo6lrM(-{z=g(Kri;wq1{p$_t
zfQ*GyV)T#QL_4|XleM?TwK()qjj4D<_9$rPZ#i8==(Utd-SRE8YQJO?S^$u%tw;dx
zS%DJGHd9IhKnAN-yiticAU$%jYk(Zw4H-G?Dl~#ygbVz`9Y;1lM3pMWJD?ld`D94u
zqmEx&zz<ylpma-e9*MbXInoz#`PlLcr$}%PnmAe{=oFCFWNFYTaDZ)*OH2?MAY`qU
z1uNS#ZG(EA1%@bKtE4h}q2Uvc6%X{==9QJ$NS+NO3fPy(qZEzrLy3AFRdQlXm=<!#
zaT*>DqZUr-DKvcHjN>}3&ueZ>7VFv3uZ(|VU1OyO6Pbx2Hh!>*fDQ2+Zp@o{8g!yU
z12Zd>G@C=gS;?}W>v`ZL)PomF!A%>pr!D8BF?HC8=`=Sta=8WC;0lvi4;PuBR%m9<
zgdG4ElrddC=z(jDwlR5KpyxC!O_4JRj!3uT_6W8z;y_$9A(O2xY0>YJxIc&&<g%pF
z^n7_@jSD#CuFl4~uvjVFji~8}Im~xdn3|@?JnDRPf^KY@Y1MU5Yg$;<$>Lgx)reh*
z<>}vX$u|^O@{-3<M4_cxqhMmkt#vOC9#hXc(W*X9#Y4(qR9(e@Pn7B?C?g&#wnM9;
zaHg(Qt#+cMUe|M;+E{0rW0Px&9qpDaUidodOQ8bl`Nk)SPV6xs&pXjWL#CqzVktge
zL=Q9F%<Jf7@;ljT1_hXJmNq!EW0TF4mD0|?4*zlyUrAI)t*Lliv}@qY-oaV^M*cI_
z1@)&9T`^7ZxM?)hDyg|n%#ZPL!<Ur*ltZAJyzGa$NN%^4Tv?|goAVcp>c(X(H}2(D
N1wUeQ&%0$D#6Ry>Q(XW6

diff --git a/JA2.vcproj b/JA2.vcproj
index 3a551e08..b3577a3c 100644
--- a/JA2.vcproj
+++ b/JA2.vcproj
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libexpatMT.lib mss32.lib winmm.lib smackw32.lib"
-				OutputFile="C:\games\Jagged Alliance 2 v1.13\ja2_v113_debug.exe"
+				OutputFile="C:\games\Jagged Alliance 2 Gold\ja2_debug.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
diff --git a/Laptop/IMP Begin Screen.cpp b/Laptop/IMP Begin Screen.cpp
index 4aff5b2f..efca9fb4 100644
--- a/Laptop/IMP Begin Screen.cpp	
+++ b/Laptop/IMP Begin Screen.cpp	
@@ -1244,7 +1244,7 @@ void Print8CharacterOnlyString( void )
 
 BOOLEAN CheckCharacterInputForEgg( void )
 {
-	MERC_HIRE_STRUCT HireMercStruct;
+//	MERC_HIRE_STRUCT HireMercStruct;
 
 #ifndef JA2BETAVERSION
 	return( FALSE );
diff --git a/Laptop/IMP Confirm.cpp b/Laptop/IMP Confirm.cpp
index 2c36827d..5705cc3d 100644
--- a/Laptop/IMP Confirm.cpp	
+++ b/Laptop/IMP Confirm.cpp	
@@ -33,7 +33,7 @@
 	#include "strategic.h"
 #endif
 
-#define IMP_MERC_FILE "IMP.dat"
+#define IMP_FILENAME_SUFFIX ".dat"
 
 IMP_ITEM_CHOICE_TYPE gIMPItemChoices[MAX_IMP_ITEM_TYPES];
 	
@@ -657,7 +657,7 @@ void WriteOutCurrentImpCharacter( INT32 iProfileId )
 	UINT32 uiBytesWritten = 0;
 
 	// open the file for writing
-	hFile = FileOpen(IMP_MERC_FILE, FILE_ACCESS_WRITE | FILE_CREATE_ALWAYS, FALSE);
+	hFile = FileOpen(strcat((STR)(&gMercProfiles[iProfileId].zNickname),IMP_FILENAME_SUFFIX), FILE_ACCESS_WRITE | FILE_CREATE_ALWAYS, FALSE);
 
 	// write out the profile id
 	if (!FileWrite(hFile, &iProfileId, sizeof( INT32 ), &uiBytesWritten))
@@ -683,14 +683,23 @@ void WriteOutCurrentImpCharacter( INT32 iProfileId )
 	return;
 }
 
-void LoadInCurrentImpCharacter( void )
+BOOLEAN ImpExists ( STR nickName )
+{
+	DWORD attribs = GetFileAttributes(strcat(nickName,IMP_FILENAME_SUFFIX));
+	if ( attribs != INVALID_FILE_ATTRIBUTES && !(attribs & FILE_ATTRIBUTE_DIRECTORY) )
+		return TRUE;
+	
+	return FALSE;
+}
+
+void LoadImpCharacter( STR nickName )
 {
 	INT32 iProfileId = 0;
 	HWFILE hFile;
 	UINT32 uiBytesRead = 0;
 
 	// open the file for writing
-	hFile = FileOpen(IMP_MERC_FILE, FILE_ACCESS_READ, FALSE);
+	hFile = FileOpen(strcat(nickName,IMP_FILENAME_SUFFIX), FILE_ACCESS_READ, FALSE);
 
 	// valid file?
 	if( hFile == -1 )
diff --git a/Laptop/IMP Confirm.h b/Laptop/IMP Confirm.h
index 1a92d399..283f49f4 100644
--- a/Laptop/IMP Confirm.h	
+++ b/Laptop/IMP Confirm.h	
@@ -7,11 +7,12 @@ void ExitIMPConfirm( void );
 void HandleIMPConfirm( void );
 
 BOOLEAN AddCharacterToPlayersTeam( void );
-void LoadInCurrentImpCharacter( void );
+void LoadImpCharacter( STR fileName );
 void WriteOutCurrentImpCharacter( INT32 iProfileId );
 
 void ResetIMPCharactersEyesAndMouthOffsets( UINT8 ubMercProfileID );
 
+BOOLEAN ImpExists ( STR fileName );
 
 #endif
 
diff --git a/Laptop/IMP HomePage.cpp b/Laptop/IMP HomePage.cpp
index 62f58eb1..fa2b0e00 100644
--- a/Laptop/IMP HomePage.cpp	
+++ b/Laptop/IMP HomePage.cpp	
@@ -396,10 +396,11 @@ void ProcessPlayerInputActivationString( void )
 	  iCurrentImpPage = IMP_MAIN_PAGE;
 	
 	}
-//Madd multiple imps else if( ( wcscmp(pPlayerActivationString, L"90210") == 0 ) && ( LaptopSaveInfo.fIMPCompletedFlag == FALSE ) )
-	else if( ( wcscmp(pPlayerActivationString, L"90210") == 0 ) )
+	//Madd multiple imps else if( ( wcscmp(pPlayerActivationString, L"90210") == 0 ) && ( LaptopSaveInfo.fIMPCompletedFlag == FALSE ) )
+	// Madd: load characters by name:
+	else if ( ImpExists( (STR)pPlayerActivationString ) )
 	{
-		LoadInCurrentImpCharacter( );
+		LoadImpCharacter( (STR)pPlayerActivationString );
 	}
 
 	else
diff --git a/Standard Gaming Platform/Standard Gaming Platform.vcproj b/Standard Gaming Platform/Standard Gaming Platform.vcproj
index 0e98bfcd..8174b842 100644
--- a/Standard Gaming Platform/Standard Gaming Platform.vcproj	
+++ b/Standard Gaming Platform/Standard Gaming Platform.vcproj	
@@ -3,8 +3,10 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="Standard Gaming Platform"
-	SccProjectName="&quot;$/Jagged Alliance 2/Development/Programming/Jagged Alliance 2/Build&quot;, AVAAAAAA"
-	SccLocalPath="..\ja2\build">
+	SccProjectName=""
+	SccAuxPath=""
+	SccLocalPath=""
+	SccProvider="">
 	<Platforms>
 		<Platform
 			Name="Win32"/>
diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp
index 79a8faeb..55fcd10b 100644
--- a/Utils/_EnglishText.cpp
+++ b/Utils/_EnglishText.cpp
@@ -297,6 +297,8 @@ UINT16 Message[][STRING_LENGTH] =
 	L"Bloodcats' turn",
 	L"full auto",
 	L"no full auto",
+	L"accurate",
+	L"inaccurate",
 };
 
 
@@ -1934,7 +1936,7 @@ STR16 pMapErrorString[] =
 	L"needs an escort to move. Place her on a squad with one.", // for a female
 	L"Merc hasn't yet arrived in Arulco!",
 	L"Looks like there's some contract negotiations to settle first.",
-	L"",
+	L"Cannot give a movement order. Air raid is going on.",		// WANNE 2
 //11-15
 	L"Movement orders? There's a battle going on!",
 	L"You have been ambushed by bloodcats in sector %s!",
@@ -4037,4 +4039,4 @@ STR16 gzLateLocalizedString[] =
 
 
 
-#endif //ENGLISH
\ No newline at end of file
+#endif //ENGLISH
diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp
index b3f3772a..16278237 100644
--- a/Utils/_GermanText.cpp
+++ b/Utils/_GermanText.cpp
@@ -3138,6 +3138,8 @@ STR16 zMarksMapScreenText[] =
 	L"%s ist voller Milizen.",
 	L"Söldner hat begrenzten Vertrag.", 
 	L"Vertrag des Söldners ist nicht versichert",
+	// WANNE 2
+	L"Kartenübersicht",		// 24
 };
 
 STR16 pLandMarkInSectorString[] =