1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Merged 2 fixes from MP Branch

Browse Source 
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
This commit is contained in:
Wanne
2009-07-15 17:25:07 +00:00
parent 5a9f0b16b1
commit 98507b972b
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameVersion.cpp
+3 -3
View File
@@ -18,7 +18,7 @@ CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.3023" };
#elif defined JA2BETAVERSION #elif defined JA2BETAVERSION
//BETA/TEST BUILD VERSION //BETA/TEST BUILD VERSION
CHAR16 zVersionLabel[256] = { L"Debug v1.13.3042" }; CHAR16 zVersionLabel[256] = { L"Debug v1.13.3111" };
#elif defined CRIPPLED_VERSION #elif defined CRIPPLED_VERSION
@@ -28,11 +28,11 @@ CHAR16 zVersionLabel[256] = { L"Beta v. 0.98" };
#else #else
//RELEASE BUILD VERSION //RELEASE BUILD VERSION
CHAR16 zVersionLabel[256] = { L"Release v1.13.3042" }; CHAR16 zVersionLabel[256] = { L"Release v1.13.3111" };
#endif #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" }; CHAR16 zTrackingNumber[16] = { L"Z" };
VFS/Location/vfs_directory_tree.cpp
+1
View File
@@ -303,6 +303,7 @@ bool vfs::CDirectoryTree::Init()
{ {
// probably directory doesn't exist. abort or continue??? // probably directory doesn't exist. abort or continue???
// -> abort AND continue // -> abort AND continue
LogException(ex);
return false; return false;
} }
qSubDirs.pop(); qSubDirs.pop();
VFS/iteratedir.cpp
+2 -1
View File
@@ -30,8 +30,9 @@ os::CIterateDirectory::CIterateDirectory(vfs::Path const& sPath, utf8string cons
fSearchHandle = FindFirstFileW((sPath+searchPattern)().c_wcs().c_str(), &fFileInfo); fSearchHandle = FindFirstFileW((sPath+searchPattern)().c_wcs().c_str(), &fFileInfo);
if (fSearchHandle == INVALID_HANDLE_VALUE) if (fSearchHandle == INVALID_HANDLE_VALUE)
{ {
DWORD error = GetLastError();
std::wstringstream wss; 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()); THROWEXCEPTION(wss.str().c_str());
} }
#else #else
ja2_2005Express.vcproj
+2 -2
View File
@@ -66,7 +66,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStaticDebug.lib ws2_32.lib" 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" LinkIncremental="2"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
@@ -145,7 +145,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStatic.lib ws2_32.lib" AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStatic.lib ws2_32.lib"
OutputFile="$(OutDir)\JA2_RU_3042.exe" OutputFile="$(OutDir)\JA2_EN_3111.exe"
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
GenerateMapFile="true" GenerateMapFile="true"