From 98507b972bd2278b8eed2a16c358ae00f20f0d99 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Wed, 15 Jul 2009 17:25:07 +0000
Subject: [PATCH] - Merged 2 fixes from MP Branch o VFS: don't convert empty
 strings o Updated _PolishText.cpp

- New EXE Release (Build: 3111)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3111 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 GameVersion.cpp                     | 6 +++---
 VFS/Location/vfs_directory_tree.cpp | 1 +
 VFS/iteratedir.cpp                  | 3 ++-
 ja2_2005Express.vcproj              | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/GameVersion.cpp b/GameVersion.cpp
index 4c77c436..3a1a9123 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -18,7 +18,7 @@ CHAR16 zVersionLabel[256]		= { L"Map Editor v1.13.3023" };
 #elif defined JA2BETAVERSION
 
 //BETA/TEST BUILD VERSION
-CHAR16 zVersionLabel[256]		= { L"Debug v1.13.3042" }; 
+CHAR16 zVersionLabel[256]		= { L"Debug v1.13.3111" }; 
 
 #elif defined CRIPPLED_VERSION
 
@@ -28,11 +28,11 @@ CHAR16 zVersionLabel[256]		= { L"Beta v. 0.98" };
 #else
 
 	//RELEASE BUILD VERSION	
-	CHAR16		zVersionLabel[256]		= { L"Release v1.13.3042" };
+	CHAR16		zVersionLabel[256]		= { L"Release v1.13.3111" };
 
 #endif
 										
-CHAR8		czVersionNumber[16]	= { "Build 09.06.28" };		//YY.MM.DD
+CHAR8		czVersionNumber[16]	= { "Build 09.07.15" };		//YY.MM.DD
 CHAR16		zTrackingNumber[16]	= { L"Z" };
 	
 
diff --git a/VFS/Location/vfs_directory_tree.cpp b/VFS/Location/vfs_directory_tree.cpp
index cbb7d2f8..c6f30719 100644
--- a/VFS/Location/vfs_directory_tree.cpp
+++ b/VFS/Location/vfs_directory_tree.cpp
@@ -303,6 +303,7 @@ bool vfs::CDirectoryTree::Init()
 		{
 			// probably directory doesn't exist. abort or continue???
 			// -> abort AND continue
+			LogException(ex);
 			return false;
 		}
 		qSubDirs.pop();
diff --git a/VFS/iteratedir.cpp b/VFS/iteratedir.cpp
index 31134328..e0d569ea 100644
--- a/VFS/iteratedir.cpp
+++ b/VFS/iteratedir.cpp
@@ -30,8 +30,9 @@ os::CIterateDirectory::CIterateDirectory(vfs::Path const& sPath, utf8string cons
 	fSearchHandle = FindFirstFileW((sPath+searchPattern)().c_wcs().c_str(), &fFileInfo);
 	if (fSearchHandle == INVALID_HANDLE_VALUE) 
 	{
+		DWORD error = GetLastError();
 		std::wstringstream wss;
-		wss << L"Path [" << (sPath+searchPattern)() << L"] does not exist";
+		wss << L"Error accessing path [" << (sPath+searchPattern)() << L"],  error code : " << error;
 		THROWEXCEPTION(wss.str().c_str());
 	}
 #else
diff --git a/ja2_2005Express.vcproj b/ja2_2005Express.vcproj
index 7c66fd0a..c9558c63 100644
--- a/ja2_2005Express.vcproj
+++ b/ja2_2005Express.vcproj
@@ -66,7 +66,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStaticDebug.lib ws2_32.lib"
-				OutputFile="$(OutDir)\JA2_EN_Debug_3042.exe"
+				OutputFile="$(OutDir)\JA2_EN_Debug_3111.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -145,7 +145,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStatic.lib ws2_32.lib"
-				OutputFile="$(OutDir)\JA2_RU_3042.exe"
+				OutputFile="$(OutDir)\JA2_EN_3111.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"