From 9827f05300ee0be2e7c5b6264400a2ea7c3f443e Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 31 Mar 2008 22:31:33 +0000 Subject: [PATCH] (svn r12525) -Release: the April Fools' edition of OpenTTD. --- bin/data/generictrams_v0.4.grf | Bin 0 -> 91743 bytes config.lib | 6 +++--- projects/openttd_vs80.vcproj | 4 ++-- projects/openttd_vs80.vcproj.in | 4 ++-- projects/openttd_vs90.vcproj | 4 ++-- projects/openttd_vs90.vcproj.in | 4 ++-- readme.txt | 1 + src/misc_gui.cpp | 1 + src/ottdres.rc.in | 8 ++++---- src/rev.cpp.in | 6 +++--- 10 files changed, 20 insertions(+), 18 deletions(-) create mode 100644 bin/data/generictrams_v0.4.grf diff --git a/bin/data/generictrams_v0.4.grf b/bin/data/generictrams_v0.4.grf new file mode 100644 index 0000000000000000000000000000000000000000..cdbe44b510943bb0356f61fd8806c8483647701c GIT binary patch literal 91743 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 Nz1ov|(VkSU{~tpT+Nl5l literal 0 HcmV?d00001 diff --git a/config.lib b/config.lib index 5a70d4351c..6c4e81aac1 100644 --- a/config.lib +++ b/config.lib @@ -5,7 +5,7 @@ log() { } set_default() { - released_version="" + released_version="0.6.0" ignore_extra_parameters="0" # We set all kinds of defaults for params. Later on the user can override @@ -40,8 +40,8 @@ set_default() { enable_static="1" enable_translator="0" enable_unicode="1" - enable_assert="1" - enable_strip="0" + enable_assert="0" + enable_strip="1" enable_universal="1" enable_osx_g5="0" enable_cocoa_quartz="1" diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj index 5327d8e360..d0832dc07f 100644 --- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -61,7 +61,7 @@ FavorSizeOrSpeed="2" OmitFramePointers="true" AdditionalIncludeDirectories="..\objs\langs" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\"" StringPooling="true" ExceptionHandling="1" RuntimeLibrary="0" @@ -272,7 +272,7 @@ FavorSizeOrSpeed="2" OmitFramePointers="true" AdditionalIncludeDirectories="..\objs\langs" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\"" StringPooling="true" ExceptionHandling="1" RuntimeLibrary="0" diff --git a/projects/openttd_vs80.vcproj.in b/projects/openttd_vs80.vcproj.in index 6f6f07166f..52b9e409be 100644 --- a/projects/openttd_vs80.vcproj.in +++ b/projects/openttd_vs80.vcproj.in @@ -61,7 +61,7 @@ FavorSizeOrSpeed="2" OmitFramePointers="true" AdditionalIncludeDirectories="..\objs\langs" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\"" StringPooling="true" ExceptionHandling="1" RuntimeLibrary="0" @@ -272,7 +272,7 @@ FavorSizeOrSpeed="2" OmitFramePointers="true" AdditionalIncludeDirectories="..\objs\langs" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\"" StringPooling="true" ExceptionHandling="1" RuntimeLibrary="0" diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj index 3447d0f62f..6865d21fb6 100644 --- a/projects/openttd_vs90.vcproj +++ b/projects/openttd_vs90.vcproj @@ -62,7 +62,7 @@ FavorSizeOrSpeed="2" OmitFramePointers="true" AdditionalIncludeDirectories="..\objs\langs" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\"" StringPooling="true" ExceptionHandling="1" RuntimeLibrary="0" @@ -270,7 +270,7 @@ FavorSizeOrSpeed="2" OmitFramePointers="true" AdditionalIncludeDirectories="..\objs\langs" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\"" StringPooling="true" ExceptionHandling="1" RuntimeLibrary="0" diff --git a/projects/openttd_vs90.vcproj.in b/projects/openttd_vs90.vcproj.in index a256f40b58..de5f233303 100644 --- a/projects/openttd_vs90.vcproj.in +++ b/projects/openttd_vs90.vcproj.in @@ -62,7 +62,7 @@ FavorSizeOrSpeed="2" OmitFramePointers="true" AdditionalIncludeDirectories="..\objs\langs" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\"" StringPooling="true" ExceptionHandling="1" RuntimeLibrary="0" @@ -270,7 +270,7 @@ FavorSizeOrSpeed="2" OmitFramePointers="true" AdditionalIncludeDirectories="..\objs\langs" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\"" StringPooling="true" ExceptionHandling="1" RuntimeLibrary="0" diff --git a/readme.txt b/readme.txt index 36c6f736f1..85879637a0 100644 --- a/readme.txt +++ b/readme.txt @@ -397,6 +397,7 @@ Thanks to: Michael Blunck - For revolutionizing TTD with awesome graphics George - Canal graphics David Dallaston (Pikka) - Tram tracks + Zephyris - Trams All Translators - For their support to make OpenTTD a truly international game Bug Reporters - Thanks for all bug reports Chris Sawyer - For an amazing game! diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index 6ff5071ed3..492b8324c3 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -253,6 +253,7 @@ static const char *credits[] = { " Michael Blunck - Pre-Signals and Semaphores © 2003", " George - Canal/Lock graphics © 2003-2004", " David Dallaston - Tram tracks", + " Zephyris - Trams", " Marcin Grzegorczyk - Foundations for Tracks on Slopes", " All Translators - Who made OpenTTD a truly international game", " Bug Reporters - Without whom OpenTTD would still be full of bugs!", diff --git a/src/ottdres.rc.in b/src/ottdres.rc.in index 2eebceadd0..581c679405 100644 --- a/src/ottdres.rc.in +++ b/src/ottdres.rc.in @@ -66,8 +66,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,6,0,@@REVISION@@ - PRODUCTVERSION 0,6,0,@@REVISION@@ + FILEVERSION 0,6,0,12525 + PRODUCTVERSION 0,6,0,12525 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -85,14 +85,14 @@ BEGIN VALUE "Comments", "This program is licensed under the GNU General Public License.\0" VALUE "CompanyName", "OpenTTD Development Team\0" VALUE "FileDescription", "OpenTTD\0" - VALUE "FileVersion", "Development @@VERSION@@\0" + VALUE "FileVersion", "0.6.0\0" VALUE "InternalName", "openttd\0" VALUE "LegalCopyright", "Copyright © OpenTTD Developers 2002-2008. All Rights Reserved.\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "openttd.exe\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "OpenTTD\0" - VALUE "ProductVersion", "Development @@VERSION@@\0" + VALUE "ProductVersion", "0.6.0\0" VALUE "SpecialBuild", "-\0" END END diff --git a/src/rev.cpp.in b/src/rev.cpp.in index 0db42ac602..f79f1f738c 100644 --- a/src/rev.cpp.in +++ b/src/rev.cpp.in @@ -19,7 +19,7 @@ * norev000 is for non-releases that are made on systems without * subversion or sources that are not a checkout of subversion. */ -extern const char _openttd_revision[] = "@@VERSION@@"; +extern const char _openttd_revision[] = "0.6.0"; /** * The NewGRF revision of OTTD: @@ -34,11 +34,11 @@ extern const char _openttd_revision[] = "@@VERSION@@"; * final release will always have a lower version number than the released * version, thus making comparisions on specific revisions easy. */ -uint32 _openttd_newgrf_version = 0 << 28 | 6 << 24 | 0 << 20 | 0 << 19 | (@@REVISION@@ & ((1 << 19) - 1)); +uint32 _openttd_newgrf_version = 0 << 28 | 6 << 24 | 0 << 20 | 1 << 19 | (12525 & ((1 << 19) - 1)); #ifdef __MORPHOS__ /** * Variable used by MorphOS to show the version. */ -extern const char morphos_versions_tag[] = "\\0$VER: OpenTTD @@VERSION@@ (@@DATE@@) OpenTTD Team [MorphOS, PowerPC]"; +extern const char morphos_versions_tag[] = "\\0$VER: OpenTTD 0.6.0 (@@DATE@@) OpenTTD Team [MorphOS, PowerPC]"; #endif