diff options
| -rw-r--r-- | projects/langs_vs80.vcproj | 15 | ||||
| -rw-r--r-- | projects/langs_vs90.vcproj | 15 | ||||
| -rw-r--r-- | projects/openttd_vs90.vcproj | 6 | ||||
| -rw-r--r-- | src/ai/api/ai_marine.cpp | 2 |
4 files changed, 34 insertions, 4 deletions
diff --git a/projects/langs_vs80.vcproj b/projects/langs_vs80.vcproj index 5f32dd6e9..9aa2349e5 100644 --- a/projects/langs_vs80.vcproj +++ b/projects/langs_vs80.vcproj @@ -212,6 +212,21 @@ </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 "$(InputPath)"
" + AdditionalDependencies="" + Outputs="..\bin\lang\english_rev.lng" + /> + </FileConfiguration> + </File> + <File RelativePath="..\src\lang\esperanto.txt" > <FileConfiguration diff --git a/projects/langs_vs90.vcproj b/projects/langs_vs90.vcproj index 42f7aa01b..72f63d188 100644 --- a/projects/langs_vs90.vcproj +++ b/projects/langs_vs90.vcproj @@ -213,6 +213,21 @@ </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 "$(InputPath)"
" + AdditionalDependencies="" + Outputs="..\bin\lang\english_rev.lng" + /> + </FileConfiguration> + </File> + <File RelativePath="..\src\lang\esperanto.txt" > <FileConfiguration diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj index 3ca3c8363..2be7069a6 100644 --- a/projects/openttd_vs90.vcproj +++ b/projects/openttd_vs90.vcproj @@ -1,7 +1,7 @@ <?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" @@ -61,7 +61,7 @@ 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=\"OpenTTD\";WITH_ASSERT" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT" StringPooling="true" ExceptionHandling="1" RuntimeLibrary="0" @@ -166,7 +166,7 @@ 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=\"OpenTTD\"" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\"" BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" diff --git a/src/ai/api/ai_marine.cpp b/src/ai/api/ai_marine.cpp index fffa1e3a3..5b23e78cc 100644 --- a/src/ai/api/ai_marine.cpp +++ b/src/ai/api/ai_marine.cpp @@ -54,7 +54,7 @@ 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); |