1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Temporary fix for game freeze when a path contains duplicate tiles

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2637 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2009-03-28 00:28:54 +00:00
parent 84299f157e
commit 6a740eb82b
3 changed files with 12 additions and 8 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.2389" };
#elif defined JA2BETAVERSION
//BETA/TEST BUILD VERSION
CHAR16 zVersionLabel[256] = { L"Debug v1.13.2633" };
CHAR16 zVersionLabel[256] = { L"Debug v1.13.2637" };
#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.2633" };
CHAR16 zVersionLabel[256] = { L"Release v1.13.2637" };
#endif
CHAR8 czVersionNumber[16] = { "Build 09.03.24" }; //YY.MM.DD
CHAR8 czVersionNumber[16] = { "Build 09.03.28" }; //YY.MM.DD
CHAR16 zTrackingNumber[16] = { L"Z" };
Tactical/PATHAI.cpp
+5 -1
View File
@@ -813,7 +813,11 @@ int AStarPathfinder::GetPath(SOLDIERTYPE *s ,
//CHAR8 str[128];
//sprintf( str, "Duplicate GridNo found during pathfinding" );
//AssertMsg( 0, str );
AssertMsg( FALSE, String( "Duplicate GridNo found during pathfinding at %d. Related to soldier %d at GridNo %d.", current, s->ubID, s->sGridNo ) );
//AssertMsg( FALSE, String( "Duplicate GridNo found during pathfinding at %d. Related to soldier %d at GridNo %d.", current, s->ubID, s->sGridNo ) );
// lalien: hack to avoid freezing, return 0 if the path is bad.
// Probably it will make trouble, need to check this
return 0;
}
}
trackNode.push_back(current);
ja2_2005Express.vcproj
+4 -4
View File
@@ -66,7 +66,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStaticDebug.lib ws2_32.lib"
OutputFile="$(OutDir)\ja2_debug_2628_en.exe"
OutputFile="$(OutDir)\JA2_v1.13.2634_EN_Debug.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_release_2633_en.exe"
OutputFile="$(OutDir)\JA2_v1.13.2634_EN_Release.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
GenerateMapFile="true"
@@ -229,7 +229,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStatic.lib ws2_32.lib"
OutputFile="$(OutDir)\Map Editor_2389_en.exe"
OutputFile="$(OutDir)\MapEditor_2634_EN_Release.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
GenerateMapFile="true"
@@ -316,7 +316,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStaticDebug.lib ws2_32.lib"
OutputFile="$(OutDir)\Map EditorD_2389_en.exe"
OutputFile="$(OutDir)\MapEditor_2634_EN_Debug.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"