cpp/openttd-patchpack/source Changeset - r12140:bed93e392a36

Changeset - r12140:bed93e392a36

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

yexo - 15 years ago 2009-06-11 14:15:18
yexo@openttd.org

(svn r16561) -Fix [NoAI]: AIMarine::AreWaterTilesConnected didn't return true for bridge head<>neighbouring water tile

4 files changed with 34 insertions and 4 deletions:

projects/langs_vs80.vcproj

projects/langs_vs90.vcproj

projects/openttd_vs90.vcproj

src/ai/api/ai_marine.cpp

0 comments (0 inline, 0 general)

projects/langs_vs80.vcproj

➞

Show inline comments

@@ @@ -209,12 +209,27 @@ @@
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\english_US.lng"
 				/>
 			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="..\src\lang\english_rev.txt"
+			>
 			<FileConfiguration
 				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating english_rev language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\english_rev.lng"
 				/>
 			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="..\src\lang\esperanto.txt"
+			>
 			<FileConfiguration
 				Name="Debug|Win32"
+				>
 				<Tool

projects/langs_vs90.vcproj

➞

Show inline comments

@@ @@ -210,12 +210,27 @@ @@
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\english_US.lng"
 				/>
 			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="..\src\lang\english_rev.txt"
+			>
 			<FileConfiguration
 				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating english_rev language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					AdditionalDependencies=""
 					Outputs="..\bin\lang\english_rev.lng"
 				/>
 			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="..\src\lang\esperanto.txt"
+			>
 			<FileConfiguration
 				Name="Debug|Win32"
+				>
 				<Tool

projects/openttd_vs90.vcproj

➞

Show inline comments

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="openttd"
 	ProjectGUID="{668328A0-B40E-4CDB-BD72-D0064424414A}"
 	RootNamespace="openttd"
 	TargetFrameworkVersion="131072"
+	>
 	<Platforms>
@@ @@ -58,13 +58,13 @@ @@
 				Optimization="3"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
 				StructMemberAlignment="3"
 				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="true"
@@ @@ -163,13 +163,13 @@ @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				AssemblerListingLocation="$(IntDir)/"
 				ObjectFile="$(IntDir)/"
 				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"

src/ai/api/ai_marine.cpp

➞

Show inline comments

@@ @@ -51,13 +51,13 @@ @@
 	/* Tiles not neighbouring */
 	if (::DistanceManhattan(t1, t2) != 1) return false;
 	DiagDirection to_other_tile = ::DiagdirBetweenTiles(t1, t2);
 	/* Determine the reachable tracks from the shared edge */
 	TrackBits gtts2 = ::TrackStatusToTrackBits(::GetTileTrackStatus(t2, TRANSPORT_WATER, 0, to_other_tile)) & ::DiagdirReachesTracks(to_other_tile);
+	TrackBits gtts2 = ::TrackStatusToTrackBits(::GetTileTrackStatus(t2, TRANSPORT_WATER, 0, ::ReverseDiagDir(to_other_tile))) & ::DiagdirReachesTracks(to_other_tile);
 	if (gtts2 == TRACK_BIT_NONE) return false;
 	to_other_tile = ReverseDiagDir(to_other_tile);
 	TrackBits gtts1 = ::TrackStatusToTrackBits(::GetTileTrackStatus(t1, TRANSPORT_WATER, 0, to_other_tile)) & ::DiagdirReachesTracks(to_other_tile);
 	return gtts1 != TRACK_BIT_NONE;

0 comments (0 inline, 0 general)