(svn r13204) -Release: 0.6.1-RC2.

changelog.txt

@@ -1,9 +1,3 @@
-0.6.1 (2008-06-01)
-------------------------------------------------------------------------
-- Fix: Industry tiles would sometimes tell they need a 'level' slope when they do not want the slope (r13348)
-- Fix: Attempts to make the old AI perform better (r13217, r13221, r13222)
-
-
 0.6.1-RC2 (2008-05-21)
 ------------------------------------------------------------------------
 - Fix: Do not send rcon commands of the server to the first client but do directly execute those on the server (r13137)

config.lib

@@ -5,7 +5,7 @@ log() {
 }
 
 set_default() {
-	released_version="0.6.1"
+	released_version="0.6.1-RC2"
 
 	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="0"
-	enable_strip="1"
+	enable_assert="1"
+	enable_strip="0"
 	enable_universal="1"
 	enable_osx_g5="0"
 	enable_cocoa_quartz="1"

os/debian/changelog

@@ -1,28 +1,22 @@
-openttd (0.6.1-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Sun, 01 Jun 2008 15:35:00 +0200
-
-openttd (0.6.1~RC2-1) unstable; urgency=low
+openttd (0.6.1~RC2) unstable; urgency=low
 
   * New upstream release.
 
  -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Wed, 21 May 2008 00:05:00 +0200
 
-openttd (0.6.1~RC1-1) unstable; urgency=low
+openttd (0.6.1~RC1) unstable; urgency=low
 
   * New upstream release.
 
  -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Sat, 26 Apr 2008 22:55:00 +0200
 
-openttd (0.6.0-1) unstable; urgency=low
+openttd (0.6.0) unstable; urgency=low
 
   * New upstream release.
 
  -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Tue, 01 Apr 2008 13:33:37 +0100
 
-openttd (0.6.0~RC1-1) unstable; urgency=low
+openttd (0.6.0~RC1) unstable; urgency=low
 
   * New upstream release.
 

os/win32/installer/install.nsi

@@ -1,6 +1,6 @@
 !define APPNAME "OpenTTD"   ; Define application name
 !define APPVERSION "0.6.1"  ; Define application version
-!define INSTALLERVERSION 48 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
+!define INSTALLERVERSION 47 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
 
 !define APPURLLINK "http://www.openttd.org"
 !define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}"

projects/determineversion.vbs

@@ -239,7 +239,7 @@ Function IsCachedVersion(version)
 End Function
 
 Dim version
-version = "0.6.1"
+version = "0.6.1-RC2"
 If Not (IsCachedVersion(version) And FSO.FileExists("../src/rev.cpp") And FSO.FileExists("../src/ottdres.rc")) Then
 	UpdateFiles version
 End If

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\""
+				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"
 				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\""
+				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"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"

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\""
+				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"
 				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\""
+				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"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"

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\""
+				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"
 				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\""
+				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"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"

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\""
+				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"
 				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\""
+				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"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"

readme.txt

@@ -1,6 +1,6 @@
 OpenTTD README
-Last updated:    2008-06-01
-Release version: 0.6.1
+Last updated:    2008-04-01
+Release version: 0.6.0
 ------------------------------------------------------------------------
 
 
@@ -397,7 +397,6 @@ 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!

src/ai/default/default.cpp

@@ -3377,8 +3377,7 @@ static void AiStateAirportStuff(Player *p)
 
 			AirportFTAClass::Flags flags = st->Airport()->flags;
 
-			/* if airport doesn't accept our kind of plane, dismiss it */
-			if (!(flags & (_players_ai[p->index].build_kind == 1 ? AirportFTAClass::HELICOPTERS : AirportFTAClass::AIRPLANES))) {
+			if (!(flags & (_players_ai[p->index].build_kind == 1 && i == 0 ? AirportFTAClass::HELICOPTERS : AirportFTAClass::AIRPLANES))) {
 				continue;
 			}
 
@@ -3464,29 +3463,12 @@ static bool AiCheckAirportResources(TileIndex tile, const AiDefaultBlockData *p,
 static int AiFindBestDefaultAirportBlock(TileIndex tile, byte cargo, byte heli, CommandCost *cost)
 {
 	const AiDefaultBlockData *p;
+	uint i;
 
-	bool no_small = false;
-
-	if (!heli) {
-		/* do not build small airport if we have large available and we are not building heli route */
-		uint valid = GetValidAirports();
-		for (uint i = 0; (p = _airport_default_block_data[i]) != NULL; i++) {
-			uint flags = GetAirport(p->attr)->flags;
-			if (HasBit(valid, p->attr) && (flags & AirportFTAClass::AIRPLANES) && !(flags & AirportFTAClass::SHORT_STRIP)) {
-				no_small = true;
-				break;
-			}
-		}
-	}
-
-	for (uint i = 0; (p = _airport_default_block_data[i]) != NULL; i++) {
-		uint flags = GetAirport(p->attr)->flags;
-		/* If we are doing a helicopter service, avoid building airports where they can't land */
-		if (heli && !(flags & AirportFTAClass::HELICOPTERS)) continue;
-		/* Similiar with aircraft ... */
-		if (!heli && !(flags & AirportFTAClass::AIRPLANES)) continue;
-		/* Do not build small airport if we prefer large */
-		if (no_small && (flags & AirportFTAClass::SHORT_STRIP)) continue;
+	for (i = 0; (p = _airport_default_block_data[i]) != NULL; i++) {
+		// If we are doing a helicopter service, avoid building
+		// airports where they can't land.
+		if (heli && !(GetAirport(p->attr)->flags & AirportFTAClass::HELICOPTERS)) continue;
 
 		*cost = AiDoBuildDefaultAirportBlock(tile, p, 0);
 		if (CmdSucceeded(*cost) && AiCheckAirportResources(tile, p, cargo))

src/industry_cmd.cpp

@@ -330,20 +330,6 @@ static uint GetSlopeZ_Industry(TileIndex tile, uint x, uint y)
 
 static Foundation GetFoundation_Industry(TileIndex tile, Slope tileh)
 {
-	IndustryGfx gfx = GetIndustryGfx(tile);
-
-	/* For NewGRF industry tiles we might not be drawing a foundation. We need to
-	 * account for this, otherwise we might be applying a FOUNDATION_LEVELED
-	 * on a steep slope which is not allowed. Furthermore other structures should
-	 * draw the wall of the foundation in this case.
-	 */
-	if (gfx >= NEW_INDUSTRYTILEOFFSET) {
-		const IndustryTileSpec *indts = GetIndustryTileSpec(gfx);
-		if (indts->grf_prop.spritegroup != NULL && HasBit(indts->callback_flags, CBM_INDT_DRAW_FOUNDATIONS)) {
-			uint32 callback_res = GetIndustryTileCallback(CBID_INDUSTRY_DRAW_FOUNDATIONS, 0, 0, gfx, GetIndustryByTile(tile), tile);
-			if (callback_res == 0) return FOUNDATION_NONE;
-		}
-	}
 	return FlatteningFoundation(tileh);
 }
 

src/misc_gui.cpp

@@ -253,7 +253,6 @@ 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!",

src/ottdres.rc.in

@@ -66,8 +66,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,6,1,13353
- PRODUCTVERSION 0,6,1,13353
+ FILEVERSION 0,6,1,13204
+ PRODUCTVERSION 0,6,1,13204
  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", "0.6.1\0"
+            VALUE "FileVersion", "0.6.1-RC2\0"
             VALUE "InternalName", "openttd\0"
             VALUE "LegalCopyright", "Copyright <20> 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", "0.6.1\0"
+            VALUE "ProductVersion", "0.6.1-RC2\0"
             VALUE "SpecialBuild", "-\0"
         END
     END

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[] = "0.6.1";
+extern const char _openttd_revision[] = "0.6.1-RC2";
 
 /**
  * The NewGRF revision of OTTD:
@@ -34,11 +34,11 @@ extern const char _openttd_revision[] = "0.6.1";
  * 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 | 1 << 20 | 1 << 19 | (13353 & ((1 << 19) - 1));
+uint32 _openttd_newgrf_version = 0 << 28 | 6 << 24 | 1 << 20 | 0 << 19 | (13204 & ((1 << 19) - 1));
 
 #ifdef __MORPHOS__
 /**
  * Variable used by MorphOS to show the version.
  */
-extern const char morphos_versions_tag[] = "\\0$VER: OpenTTD 0.6.1 (@@DATE@@)  OpenTTD Team [MorphOS, PowerPC]";
+extern const char morphos_versions_tag[] = "\\0$VER: OpenTTD 0.6.1-RC2 (@@DATE@@)  OpenTTD Team [MorphOS, PowerPC]";
 #endif

src/table/ai_rail.h

@@ -591,27 +591,15 @@ static const AiDefaultBlockData _airportdata_ai_5[] = {
 	MKEND(),
 };
 
-static const AiDefaultBlockData _airportdata_ai_6[] = {
-	MKAIR(6, 0, 0),
-	MKEND(),
-};
-
 static const AiDefaultBlockData _airportdata_ai_7[] = {
 	MKAIR(7, 0, 0),
 	MKEND(),
 };
 
-static const AiDefaultBlockData _airportdata_ai_8[] = {
-	MKAIR(8, 0, 0),
-	MKEND(),
-};
-
 #undef MKAIR
 #undef MDEND
 
 static const AiDefaultBlockData * const _airport_default_block_data[] = {
-	_airportdata_ai_8, // helistation
-	_airportdata_ai_6, // helidepot
 	_airportdata_ai_7, // intercontinental airport
 	_airportdata_ai_4, // international airport
 	_airportdata_ai_3, // metropolitan airport