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

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

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}
+		{2124B612-013E-492D-911C-B5737D60EEDF} = {2124B612-013E-492D-911C-B5737D60EEDF}
-		{E0E16C88-C352-4C37-AC27-BFF3FDF18E82} = {E0E16C88-C352-4C37-AC27-BFF3FDF18E82}
 		{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

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

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

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 )

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
 

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 ) )
+	//Madd multiple imps else if( ( wcscmp(pPlayerActivationString, L"90210") == 0 ) && ( LaptopSaveInfo.fIMPCompletedFlag == FALSE ) )
-	else if( ( wcscmp(pPlayerActivationString, L"90210") == 0 ) )
+	// Madd: load characters by name:
+	else if ( ImpExists( (STR)pPlayerActivationString ) )
 	{
-		LoadInCurrentImpCharacter( );
+		LoadImpCharacter( (STR)pPlayerActivationString );
 	}
 
 	else

Standard Gaming Platform/Standard Gaming Platform.vcproj

@@ -3,8 +3,10 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="Standard Gaming Platform"
-	SccProjectName=""$/Jagged Alliance 2/Development/Programming/Jagged Alliance 2/Build", AVAAAAAA"
+	SccProjectName=""
-	SccLocalPath="..\ja2\build">
+	SccAuxPath=""
+	SccLocalPath=""
+	SccProvider="">
 	<Platforms>
 		<Platform
 			Name="Win32"/>

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
+#endif //ENGLISH

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[] =