--- a/BUGS	Fri Nov 23 16:59:30 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-/* $Id$ */
-
-KNOWN BUGS / PROBLEMS:
-
-bridges:
-- Clearing tiles which may not have a bridge above can cause random bridge pieces to appear, which leads to crash in the long run
-
-electrified rails:
-Normal and elrail depots look the same. Use 'X' (transparent buildings)
-   to distinguish between them
-Missing curors / icons for construction (currently using the conventional ones)
-

Binary file bin/data/openttdd.grf has changed

Binary file bin/data/openttdw.grf has changed

--- a/changelog.txt	Fri Nov 23 16:59:30 2007 +0000
+++ b/changelog.txt	Wed Jan 09 18:11:12 2008 +0000
@@ -1,3 +1,48 @@
+
+0.6.0-beta2 (2007-12-09)
+------------------------------------------------------------------------
+- Feature: Allow setting a default password for new companies in network games (r11556)
+- Feature: Signal selection GUI for the ones that really like to use that over CTRL (r11547)
+- Feature: Make the bridge selection window resizable (r11539)
+- Feature: [OSX] Added support for using Quartz instead of Quickdraw in windowed mode on OS X 10.4 and higher (r11496)
+- Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available, allow to enable/disable individually or all at once, the industries shown on small map (r11474)
+- Codechange: Send and store the passwords a little more secure to/in the servers (r11557)
+- Fix: Wrong error messages were shown when trying to build some industries in the scenario editor [FS#1524] (r11609)
+- Fix: [NewGRF] Do not trigger industries, but only the industry's tiles (r11608)
+- Fix: Wrong count of Kirby trains when a ship was build [FS#1482] (r11605)
+- Fix: Tiles were not marked dirty in some cases when removing a lock or flooding (r11582, r11604)
+- Fix: Make price for railtype conversion more realistic; conversion should not be more expensive than removing and rebuilding [FS#1481] (r11603)
+- Fix: Do not allow changing network only patches settings from console when not in network game (r11594)
+- Fix: IsSlopeRefused() result was half wrong causing banks to be built on wrong places (r11590)
+- Fix: When ship depots got destroyed they always returned to water, even when it should have been canals [FS#1514] (r11589)
+- Fix: The one way road button wasn't reset on abort (r11587)
+- Fix: Windows could get completely missing when one resized the window to something very small [FS#1484] (r11583)
+- Fix: Invalidate 'list trains/roadvehs/ships/planes' widgets when station part is added/removed so it does not become glitchy (r11577)
+- Fix: Flood train stations when there are no trains on border tiles too (r11574, r11570)
+- Fix: Reinitialise windows system before loading a savegame because not doing so can cause crashes [FS#1494] (r11572)
+- Fix: Road vehicle getting to the wrong side of a station when trying to overtake in there [FS#1493] (r11571)
+- Fix: Full paths sometimes did not work correctly [FS#1480] (r11568)
+- Fix: Break the chain before moving a vehicle after another in the same chain instead of causing an infinite loop [FS#1512] (r11566)
+- Fix: Aircraft sometimes stopped mid-air when the airport got destroyed [FS#1503] (r11562)
+- Fix: Group list was not updated when removing the last group [FS#1504] (r11561)
+- Fix: Overflow when drawing graphics with high company values [FS#1505] (r11558)
+- Fix: If ever the air/heliport is suddenly not available while the "chopper" is descending, just go back into flying instead of stopping mid air [FS#1496] (r11546)
+- Fix: Cargo translation was sometimes done when it should not be done [FS#1501] (r11544)
+- Fix: [OSX] Detect statvfs at runtime (based on OSX version) instead of compile time. This should prevent a crash on OSX 10.3 with the precompiled binaries (in the load/save windows) (r11541)
+- Fix: [OSX] Do not try to compile the quartz video driver on OSX 10.3 as it will fail (r11540)
+- Fix: Do not do all kinds of 'updates' for town, waypoint, station and other signs when you have not converted the map to the 'current' format as that means you are going to read data in the 'old' format when you assume that it is in the 'current' format, which is eventually going to break (r11525)
+- Fix: Assertion when tram reversed at a station [FS#1485] (r11524)
+- Fix: The scrollbar of the network gui could run out of bounds (r11522)
+- Fix: [OSX] The cocoa video driver let the mouse cursor escape the window when using rmb scrolling (r11520)
+- Fix: Signs totally illegible when transparant signs is turned on and zoomed out more than one level [FS#1463] (r11507)
+- Fix: Selling vehicles could cause the window of others to scroll to that location [FS#1471] (r11506)
+- Fix: Do not do standard production change if callbacks 29/35 failed, disable smooth economy for industries using callbacks 29/35 (r11502)
+- Fix: Two small layout issues with the vehicle grouping GUI (r11478)
+- Fix: A road vehicle must not show that it is driving max speed when it is standing still waiting for the vehicle in from of it [FS#1451] (r11477)
+- Fix: OpenBSD has ALIGN already defined, causing compilation failures [FS#1450] (r11467)
+- Fix: Operator priority problem resulting in problematic autoroad placement in some cases (r11466)
+
+
 0.6.0-beta1 (2007-11-18)
 ------------------------------------------------------------------------
 - Feature: Make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing (r11442)
@@ -32,7 +77,7 @@
 - Feature: New sign editor features including switching to previous/next sign (r10401)
 - Feature: Disallow (in the GUI) the building of infrastructure you do not have available vehicles for. This means that the airport building button is disabled till you can actually build aircraft. The game itself will not disallow you to build the infrastructure and this "new" behaviour can be overridden with a patch setting [FS#669] (r10353)
 - Feature: Add the possibility of automatically filling in timetables based on the times from the first (or subsequent) run-throughs (r10331)
-- Feature: Option to select the "default" rail type when you start a new game or load a game. This is done either static, i.e. rail, electrified rail, monorail and maglev, or dynamic which takes either the first or last available railtype or the railtype that is used most on the map  [FS#812] (r10329)
+- Feature: Option to select the "default" rail type when you start a new game or load a game. This is done either static, i.e. rail, electrified rail, monorail and maglev, or dynamic which takes either the first or last available railtype or the railtype that is used most on the map [FS#812] (r10329)
 - Feature: Give a better explanation why the loading of a savegame failed and do not crash on loading savegames that were altered by patches or branches [FS#917] (r10300)
 - Feature: A sticky button for the client list window [FS#885] (r10293)
 - Feature: Allow double-clicking on certain places: add NewGRF window, build-vehicle and town-action (r10265, r10267)
@@ -384,7 +429,7 @@
 - Fix: Draw canal edges under buoys that are in a canal (r8635)
 - Fix: Buoys on canal tiles do not flood anymore (r8620)
 - Fix: Store the ownership of a water tile in the buoy tile and set the ownership of the water tile when the buoy is removed. Prevents certain abuses (r8619)
-- Fix: When the currently selected player in the performance details window is no longer active, choose the first active player instead of the first player as that may also be inactive  [FS#582] (r8612)
+- Fix: When the currently selected player in the performance details window is no longer active, choose the first active player instead of the first player as that may also be inactive [FS#582] (r8612)
 - Fix: Road vehicle very close after another (slower) road vehicle gets its speed reset to 0 when entering a tunnel, which causes a traffic jam outside of the tunnel (r8609)
 - Fix: Bridges do not get destroyed when the bridge head gets flooded and there is a vehicle on the bridge [FS#564] (r8593)
 - Fix: Road Vehicles now can obtain a slot even if the station is very spread out [FS#577] (r8536)
@@ -1028,7 +1073,7 @@
 - Feature: scrolling credits list (in  alphabetical order)
 - Feature: Train window now shows the number of vehicles per row (mpetrov)
 - Feature: [ 1039061 ] Swiss town-names (vulvulune)
-- Feature: [ 1090950 ] Adding 16:10 resolutions for mainly laptops  (doode)
+- Feature: [ 1090950 ] Adding 16:10 resolutions for mainly laptops (doode)
 - Feature: [ 1098254 ] (dis)Allow Shares. Add patch options to allow buying/selling of shares (Hackykid)
 - Fix: [ 1031451 ] Catchment area shows when buying sign
 - Fix: [ 1040119 ] Flood and wagons in depot

--- a/config.lib	Fri Nov 23 16:59:30 2007 +0000
+++ b/config.lib	Wed Jan 09 18:11:12 2008 +0000
@@ -32,6 +32,7 @@
 	personal_dir="1"
 	install_dir="/"
 	enable_debug="0"
+	enable_desync_debug="0"
 	enable_profiling="0"
 	enable_dedicated="0"
 	enable_network="1"
@@ -42,6 +43,8 @@
 	enable_universal="1"
 	enable_osx_g5="0"
 	enable_unicode="1"
+	enable_cocoa_quartz="1"
+	enable_cocoa_quickdraw="1"
 	with_distcc="1"
 	with_ccache="1"
 	with_osx_sysroot="1"
@@ -62,7 +65,7 @@
 	with_psp_config="1"
 	with_threads="1"
 
-	save_params_array="build host cc_build cc_host cxx_build cxx_host windres strip awk lipo os cpu_type revision endian config_log prefix_dir binary_dir data_dir icon_dir personal_dir install_dir enable_debug enable_profiling enable_dedicated enable_network enable_static enable_translator enable_assert enable_strip with_distcc with_osx_sysroot enable_universal enable_osx_g5 enable_unicode with_application_bundle with_sdl with_cocoa with_zlib with_png with_makedepend with_direct_music with_sort with_iconv with_midi with_midi_arg with_libtimidity with_freetype with_fontconfig with_psp_config with_threads CC CXX CFLAGS LDFLAGS"
+	save_params_array="build host cc_build cc_host cxx_build cxx_host windres strip awk lipo os cpu_type revision endian config_log prefix_dir binary_dir data_dir icon_dir personal_dir install_dir enable_debug enable_desync_debug enable_profiling enable_dedicated enable_network enable_static enable_translator enable_assert enable_strip with_distcc with_osx_sysroot enable_universal enable_osx_g5 enable_unicode enable_cocoa_quartz enable_cocoa_quickdraw with_application_bundle with_sdl with_cocoa with_zlib with_png with_makedepend with_direct_music with_sort with_iconv with_midi with_midi_arg with_libtimidity with_freetype with_fontconfig with_psp_config with_threads CC CXX CFLAGS LDFLAGS"
 }
 
 detect_params() {
@@ -142,6 +145,8 @@
 
 			--enable-debug)               enable_debug="1";;
 			--enable-debug=*)             enable_debug="$optarg";;
+			--enable-desync-debug)        enable_desync_debug="1";;
+			--enable-desync-debug=*)      enable_desync_debug="$optarg";;
 			--enable-profiling)           enable_profiling="1";;
 			--enable-profiling=*)         enable_profiling="$optarg";;
 			--enable-dedicated)           enable_dedicated="1";;
@@ -170,6 +175,13 @@
 			--enable-unicode)             enable_unicode="2";;
 			--enable-unicode=*)           enable_unicode="$optarg";;
 
+			--disable-cocoa-quartz)       enable_cocoa_quartz="0";;
+			--enable-cocoa-quartz)        enable_cocoa_quartz="2";;
+			--enable-cocoa-quartz=*)      enable_cocoa_quartz="$optarg";;
+			--disable-cocoa-quickdraw)    enable_cocoa_quickdraw="0";;
+			--enable-cocoa-quickdraw)     enable_cocoa_quickdraw="2";;
+			--enable-cocoa-quickdraw=*)   enable_cocoa_quickdraw="$optarg";;
+
 			--with-sdl)                   with_sdl="2";;
 			--without-sdl)                with_sdl="0";;
 			--with-sdl=*)                 with_sdl="$optarg";;
@@ -337,6 +349,13 @@
 		exit 1
 	fi
 
+	# enable_desync_debug should be between 0 and 3
+	if [ -z "`echo $enable_desync_debug | egrep '^[012]$'`" ]; then
+		echo "configure: error: invalid option --enable-desync-debug=$enable_desync_debug"
+		echo " Available options are: --enable-desync-debug[=012]"
+		exit 1
+	fi
+
 	detect_awk
 
 	check_build
@@ -376,7 +395,7 @@
 	detect_cputype
 
 	if [ "$enable_static" = "1" ]; then
-		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "MORPHOS" ] || [ "$os" = "OSX" ]; then
+		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "MORPHOS" ]; then
 			enable_static="2"
 		else
 			enable_static="0"
@@ -419,6 +438,17 @@
 		log 1 "using debug level... level $enable_debug"
 	fi
 
+	if [ "$enable_desync_debug" = "0" ]; then
+		log 1 "using desync debug level... no"
+	else
+		log 1 "using desync debug level... level $enable_desync_debug"
+		log 1 "WARNING: desync debug functions slow down the game considerably."
+		log 1 "WARNING: use only when you are instructed to do so"
+		log 1 "         or when you know what you are doing."
+
+		sleep 5
+	fi
+
 	detect_sdl
 	detect_cocoa
 
@@ -799,60 +829,76 @@
 		CFLAGS="$CFLAGS -DNO_THREADS"
 	fi
 
-	# Enable some things only for certain GCC versions
-	cc_version=`$cc_host -dumpversion | cut -c 1,3`
-
-	if [ $cc_version -ge 29 ]; then
-		CFLAGS="$CFLAGS -Wall -Wno-multichar -Wsign-compare -Wundef"
-		CFLAGS="$CFLAGS -Wwrite-strings -Wpointer-arith"
-		CFLAGS="$CFLAGS -Wno-uninitialized"
-
-		CC_CFLAGS="$CC_CFLAGS -Wstrict-prototypes"
-	fi
-
-	gcc295=""
-	if [ "$cc_version" = 29 ]; then
-		# Make sure we mark GCC 2.95 flag for Makefile.src.in, as we
-		#  need a lovely hack there to make it compile correctly.
-		gcc295="1"
-	fi
-
-	if [ $cc_version -ge 30 ]; then
-		CFLAGS="$CFLAGS -W -Wno-unused-parameter"
-	fi
-
-	if [ $cc_version -ge 34 ]; then
-		CC_CFLAGS="$CC_CFLAGS -Wdeclaration-after-statement -Wold-style-definition"
-	fi
+	if [ `echo $cc_host | cut -c 1-3` = "icc" ]; then
+		# Enable some things only for certain ICC versions
+		cc_version=`$cc_host -dumpversion | cut -c 1-4`
 
-	if [ "$os" = "CYGWIN" ]; then
-		CFLAGS="$CFLAGS -mwin32"
-		LDFLAGS="$LDFLAGS -mwin32"
-	fi
-	if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then
-		CFLAGS="$CFLAGS -mno-cygwin"
-		LDFLAGS="$LDFLAGS -mno-cygwin"
-	fi
-
-	if [ "$os" = "CYGWIN" ] || [ "$os" = "MINGW" ]; then
-		LDFLAGS="$LDFLAGS -Wl,--subsystem,windows"
-		LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32"
-	fi
 
-	# GCC 4.0+ complains about that we break strict-aliasing.
-	#  On most places we don't see how to fix it, and it doesn't
-	#  break anything. So disable strict-aliasing to make the
-	#  compiler all happy.
-	if [ $cc_version -ge 40 ]; then
-		CFLAGS="$CFLAGS -fno-strict-aliasing"
-	fi
+		if [ "$cc_version" = "10.1" ]; then
+			CFLAGS="$CFLAGS -Wno-multichar"
+		fi
+	else
+		# Enable some things only for certain GCC versions
+		cc_version=`$cc_host -dumpversion | cut -c 1,3`
 
-	# GCC 4.2+ automatically assumes that signed overflows do
-	# not occur in signed arithmetics, whereas we are not
-	# sure that they will not happen. It furthermore complains
-	# about it's own optimized code in some places.
-	if [ $cc_version -ge 42 ]; then
-		CFLAGS="$CFLAGS -fno-strict-overflow"
+		if [ $cc_version -ge 29 ]; then
+			CFLAGS="$CFLAGS -Wall -Wno-multichar -Wsign-compare -Wundef"
+			CFLAGS="$CFLAGS -Wwrite-strings -Wpointer-arith"
+			CFLAGS="$CFLAGS -Wno-uninitialized"
+
+			CC_CFLAGS="$CC_CFLAGS -Wstrict-prototypes"
+		fi
+
+		gcc295=""
+		if [ "$cc_version" = 29 ]; then
+			# Make sure we mark GCC 2.95 flag for Makefile.src.in, as we
+			#  need a lovely hack there to make it compile correctly.
+			gcc295="1"
+		fi
+
+		if [ $cc_version -ge 30 ]; then
+			CFLAGS="$CFLAGS -W -Wno-unused-parameter"
+		fi
+
+		if [ $cc_version -ge 34 ]; then
+			CC_CFLAGS="$CC_CFLAGS -Wdeclaration-after-statement -Wold-style-definition"
+		fi
+
+		if [ "$os" = "CYGWIN" ]; then
+			CFLAGS="$CFLAGS -mwin32"
+			LDFLAGS="$LDFLAGS -mwin32"
+		fi
+		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then
+			CFLAGS="$CFLAGS -mno-cygwin"
+			LDFLAGS="$LDFLAGS -mno-cygwin"
+		fi
+
+		if [ "$os" = "CYGWIN" ] || [ "$os" = "MINGW" ]; then
+			LDFLAGS="$LDFLAGS -Wl,--subsystem,windows"
+			LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32"
+		fi
+
+		# GCC 4.0+ complains about that we break strict-aliasing.
+		#  On most places we don't see how to fix it, and it doesn't
+		#  break anything. So disable strict-aliasing to make the
+		#  compiler all happy.
+		if [ $cc_version -ge 40 ]; then
+			CFLAGS="$CFLAGS -fno-strict-aliasing"
+		fi
+
+		# GCC 4.2+ automatically assumes that signed overflows do
+		# not occur in signed arithmetics, whereas we are not
+		# sure that they will not happen. It furthermore complains
+		# about it's own optimized code in some places.
+		if [ $cc_version -ge 42 ]; then
+			CFLAGS="$CFLAGS -fno-strict-overflow"
+		fi
+
+		# GCC 4.3+ gives a warning about empty body of
+		# loops and conditions
+		if [ $cc_version -ge 43 ]; then
+			CFLAGS="$CFLAGS -Wno-empty-body"
+		fi
 	fi
 
 	if [ "$os" != "CYGWIN" ] && [ "$os" != "FREEBSD" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ] && [ "$os" != "OS2" ]; then
@@ -922,6 +968,14 @@
 	if [ "$with_cocoa" != "0" ]; then
 		CFLAGS="$CFLAGS -DWITH_COCOA"
 		LIBS="$LIBS -F/System/Library/Frameworks -framework Cocoa -framework Carbon -framework AudioUnit"
+
+		if [ "$enable_cocoa_quartz" != "0" ]; then
+			CFLAGS="$CFLAGS -DENABLE_COCOA_QUARTZ"
+		fi
+
+		if [ "$enable_cocoa_quickdraw" != "0" ]; then
+			CFLAGS="$CFLAGS -DENABLE_COCOA_QUICKDRAW"
+		fi
 	fi
 
 	if [ "$with_zlib" != "0" ]; then
@@ -1058,6 +1112,13 @@
 		CFLAGS="$CFLAGS -DNDEBUG"
 	fi
 
+	if [ "$enable_desync_debug" = "1" ]; then
+		CFLAGS="$CFLAGS -DDEBUG_DUMP_COMMANDS"
+	fi
+	if [ "$enable_desync_debug" = "2" ]; then
+		CFLAGS="$CFLAGS -DRANDOM_DEBUG"
+	fi
+
 	if [ "$enable_osx_g5" != "0" ]; then
 		CFLAGS="$CFLAGS -mtune=970 -mcpu=970 -mpowerpc-gpopt"
 	fi
@@ -1530,6 +1591,19 @@
 	fi
 
 	log 1 "checking COCOA... found"
+
+
+	if [ "$enable_cocoa_quartz" != "0" ]; then
+		log 1 "checking whether to enable the Quartz window subdriver... yes"
+	else
+		log 1 "checking whether to enable the Quartz window subdriver... no"
+	fi
+
+	if [ "$enable_cocoa_quickdraw" != "0" ]; then
+		log 1 "checking whether to enable the Quickdraw window subdriver... yes"
+	else
+		log 1 "checking whether to enable the Quickdraw window subdriver... no"
+	fi
 }
 
 detect_library() {
@@ -1982,7 +2056,7 @@
 	ppc=`$cc_host -dumpmachine | egrep "powerpc|ppc"`
 	if [ -n "$ppc" ]; then
 		T_CFLAGS="$CFLAGS -DFOUR_BYTE_BOOL"
-		osx_sysroot_version=10.3.9
+		osx_sysroot_version=10.4u
 	else
 		T_CFLAGS="$CFLAGS"
 		osx_sysroot_version=10.4u
@@ -2181,6 +2255,8 @@
 	echo "  --enable-translator            enable extra output for translators"
 	echo "  --enable-universal             enable universal builds (OSX ONLY)"
 	echo "  --enable-osx-g5                enables optimalizations for G5 (OSX ONLY)"
+	echo "  --disable-cocoa-quartz         disable the quartz window mode driver for Cocoa (OSX ONLY)"
+	echo "  --disable-cocoa-quickdraw      disable the quickdraw window mode driver for Cocoa (OSX ONLY)"
 	echo "  --disable-unicode              disable unicode support to build win9x"
 	echo "                                 version (Win32 ONLY)"
 	echo "  --disable-network              disable network support"

--- a/configure	Fri Nov 23 16:59:30 2007 +0000
+++ b/configure	Wed Jan 09 18:11:12 2008 +0000
@@ -31,7 +31,7 @@
 MEDIA_DIR="$ROOT_DIR/media"
 SOURCE_LIST="$ROOT_DIR/source.list"
 
-if [ "$1" = "--reconfig" ]; then
+if [ "$1" = "--reconfig" ] || [ "$1" = "--reconfigure" ]; then
 	if ! [ -f "config.cache" ]; then
 		echo "can't reconfigure, because never configured before"
 		exit 1

--- a/docs/landscape.html	Fri Nov 23 16:59:30 2007 +0000
+++ b/docs/landscape.html	Wed Jan 09 18:11:12 2008 +0000
@@ -945,6 +945,7 @@
        </tr>
       </table>
      </li>
+     <li>m4: Owner of the water</li>
      <li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
      <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
     </ul>

--- a/docs/landscape_grid.html	Fri Nov 23 16:59:30 2007 +0000
+++ b/docs/landscape_grid.html	Wed Jan 09 18:11:12 2008 +0000
@@ -194,8 +194,8 @@
       <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OO</span>XX</td>
+      <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX XXXX</td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>

--- a/known-bugs.txt	Fri Nov 23 16:59:30 2007 +0000
+++ b/known-bugs.txt	Wed Jan 09 18:11:12 2008 +0000
@@ -15,15 +15,16 @@
 ------------------------------------------------------------------------
 URL: http://bugs.openttd.org
 
-- 1434	Network game crashes when player builds SH40
+- 1519	Full screen issues in windows
+- 1495	Long vehicles block multistop station
+- 1487	Ending_year is never written to
+- 1473	Train not going to available platform
 - 1404	Spinner widget interprets one click as many
-- 1401	Crash while scrolling screen
 - 1386	Mac OS X fails to compile out of the box on 10.5
 - 1264	Autoreplace for multiple NewGRF DMU sets fails
 - 1200	Illegal names skip comparisons for uniquity
 - 1141	[OSX] Not smooth moving map with touchpad
 - 1109	[OSX] Choppy mouse cursor movement in fullscreen mode
-- 1094	Foundations showing on 'build on slopes'
 - 1074	Large slowdown when building tracks
 - 1072	Text overflows in several windows
 -  716	Train crash in depot with long long tracks

--- a/os/debian/changelog	Fri Nov 23 16:59:30 2007 +0000
+++ b/os/debian/changelog	Wed Jan 09 18:11:12 2008 +0000
@@ -4,6 +4,12 @@
 
  -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Mon, 26 Feb 2007 21:07:05 +0100
 
+openttd (0.6.0~beta2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Sun, 09 Dec 2007 22:05:05 +0100
+
 openttd (0.6.0~beta1-1) unstable; urgency=low
 
   * New upstream release.

--- a/os/win32/installer/install.nsi	Fri Nov 23 16:59:30 2007 +0000
+++ b/os/win32/installer/install.nsi	Wed Jan 09 18:11:12 2008 +0000
@@ -1,6 +1,6 @@
 !define APPNAME "OpenTTD"   ; Define application name
 !define APPVERSION "0.6.0"  ; Define application version
-!define INSTALLERVERSION 39 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
+!define INSTALLERVERSION 40 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
 
 !define APPURLLINK "http://www.openttd.org"
 !define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}-beta1"

--- a/projects/determineversion.vbs	Fri Nov 23 16:59:30 2007 +0000
+++ b/projects/determineversion.vbs	Wed Jan 09 18:11:12 2008 +0000
@@ -127,10 +127,7 @@
 		' svn detection failed, reset error and try git
 		Err.Clear
 		Set oExec = WshShell.Exec("git rev-parse --verify --short=8 HEAD")
-		Do While oExec.Status = 0 And Err.Number = 0
-			' Wait till command has finished
-		Loop
-		If Err.Number = 0 And oExec.ExitCode = 0 Then
+		If Err.Number = 0 Then
 			version = "g" & oExec.StdOut.ReadLine()
 			Set oExec = WshShell.Exec("git diff-index --exit-code --quiet HEAD ../src")
 			Do While oExec.Status = 0 And Err.Number = 0

--- a/projects/langs.vcproj	Fri Nov 23 16:59:30 2007 +0000
+++ b/projects/langs.vcproj	Wed Jan 09 18:11:12 2008 +0000
@@ -52,19 +52,6 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\american.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating american language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
-"
-					AdditionalDependencies=""
-					Outputs="..\bin\lang\american.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
 			RelativePath="..\src\lang\brazilian_portuguese.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
@@ -169,6 +156,19 @@
 			</FileConfiguration>
 		</File>
 		<File
+			RelativePath="..\src\lang\english_US.txt">
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating english_US language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\english_US.lng"/>
+			</FileConfiguration>
+		</File>
+		<File
 			RelativePath="..\src\lang\esperanto.txt">
 			<FileConfiguration
 				Name="Debug|Win32">

--- a/projects/langs_vs80.vcproj	Fri Nov 23 16:59:30 2007 +0000
+++ b/projects/langs_vs80.vcproj	Wed Jan 09 18:11:12 2008 +0000
@@ -62,21 +62,6 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\american.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating american language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies=""
-					Outputs="..\bin\lang\american.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
 			RelativePath="..\src\lang\brazilian_portuguese.txt"
 			>
 			<FileConfiguration
@@ -197,6 +182,21 @@
 			</FileConfiguration>
 		</File>
 		<File
+			RelativePath="..\src\lang\english_US.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating english_US language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\english_US.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
 			RelativePath="..\src\lang\esperanto.txt"
 			>
 			<FileConfiguration

--- a/projects/langs_vs90.vcproj	Fri Nov 23 16:59:30 2007 +0000
+++ b/projects/langs_vs90.vcproj	Wed Jan 09 18:11:12 2008 +0000
@@ -63,21 +63,6 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\american.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating american language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies=""
-					Outputs="..\bin\lang\american.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
 			RelativePath="..\src\lang\brazilian_portuguese.txt"
 			>
 			<FileConfiguration
@@ -198,6 +183,21 @@
 			</FileConfiguration>
 		</File>
 		<File
+			RelativePath="..\src\lang\english_US.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating english_US language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\english_US.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
 			RelativePath="..\src\lang\esperanto.txt"
 			>
 			<FileConfiguration

--- a/projects/openttd.vcproj	Fri Nov 23 16:59:30 2007 +0000
+++ b/projects/openttd.vcproj	Wed Jan 09 18:11:12 2008 +0000
@@ -198,6 +198,9 @@
 				RelativePath=".\..\src\console_cmds.cpp">
 			</File>
 			<File
+				RelativePath=".\..\src\core\bitmath_func.cpp">
+			</File>
+			<File
 				RelativePath=".\..\src\core\random_func.cpp">
 			</File>
 			<File
@@ -375,7 +378,7 @@
 				RelativePath=".\..\src\thread.cpp">
 			</File>
 			<File
-				RelativePath=".\..\src\tile.cpp">
+				RelativePath=".\..\src\tile_map.cpp">
 			</File>
 			<File
 				RelativePath=".\..\src\vehicle.cpp">
@@ -433,6 +436,9 @@
 				RelativePath=".\..\src\console.h">
 			</File>
 			<File
+				RelativePath=".\..\src\core\bitmath_func.hpp">
+			</File>
+			<File
 				RelativePath=".\..\src\core\math_func.hpp">
 			</File>
 			<File
@@ -499,9 +505,6 @@
 				RelativePath=".\..\src\heightmap.h">
 			</File>
 			<File
-				RelativePath=".\..\src\helpers.hpp">
-			</File>
-			<File
 				RelativePath=".\..\src\industry.h">
 			</File>
 			<File
@@ -511,9 +514,6 @@
 				RelativePath=".\..\src\livery.h">
 			</File>
 			<File
-				RelativePath=".\..\src\macros.h">
-			</File>
-			<File
 				RelativePath=".\..\src\map.h">
 			</File>
 			<File
@@ -682,6 +682,9 @@
 				RelativePath=".\..\src\station.h">
 			</File>
 			<File
+				RelativePath=".\..\src\station_gui.h">
+			</File>
+			<File
 				RelativePath=".\..\src\stdafx.h">
 			</File>
 			<File
@@ -900,6 +903,9 @@
 				RelativePath=".\..\src\station_cmd.cpp">
 			</File>
 			<File
+				RelativePath=".\..\src\terraform_cmd.cpp">
+			</File>
+			<File
 				RelativePath=".\..\src\timetable_cmd.cpp">
 			</File>
 			<File
@@ -1535,6 +1541,9 @@
 				RelativePath=".\..\src\tunnel_map.h">
 			</File>
 			<File
+				RelativePath=".\..\src\tunnelbridge_map.h">
+			</File>
+			<File
 				RelativePath=".\..\src\unmovable_map.h">
 			</File>
 			<File

--- a/projects/openttd_vs80.vcproj	Fri Nov 23 16:59:30 2007 +0000
+++ b/projects/openttd_vs80.vcproj	Wed Jan 09 18:11:12 2008 +0000
@@ -496,6 +496,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\core\bitmath_func.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\core\random_func.cpp"
 				>
 			</File>
@@ -732,7 +736,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\tile.cpp"
+				RelativePath=".\..\src\tile_map.cpp"
 				>
 			</File>
 			<File
@@ -808,6 +812,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\core\bitmath_func.hpp"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\core\math_func.hpp"
 				>
 			</File>
@@ -896,10 +904,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\helpers.hpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\industry.h"
 				>
 			</File>
@@ -912,10 +916,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\macros.h"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\map.h"
 				>
 			</File>
@@ -1140,6 +1140,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\station_gui.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\stdafx.h"
 				>
 			</File>
@@ -1428,6 +1432,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\terraform_cmd.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\timetable_cmd.cpp"
 				>
 			</File>
@@ -2260,6 +2268,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\tunnelbridge_map.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\unmovable_map.h"
 				>
 			</File>

--- a/projects/openttd_vs90.vcproj	Fri Nov 23 16:59:30 2007 +0000
+++ b/projects/openttd_vs90.vcproj	Wed Jan 09 18:11:12 2008 +0000
@@ -493,6 +493,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\core\bitmath_func.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\core\random_func.cpp"
 				>
 			</File>
@@ -721,7 +725,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\tile.cpp"
+				RelativePath=".\..\src\tile_map.cpp"
 				>
 			</File>
 			<File
@@ -797,6 +801,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\core\bitmath_func.hpp"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\core\math_func.hpp"
 				>
 			</File>
@@ -885,10 +893,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\helpers.hpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\industry.h"
 				>
 			</File>
@@ -901,10 +905,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\macros.h"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\map.h"
 				>
 			</File>
@@ -1113,6 +1113,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\station_gui.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\stdafx.h"
 				>
 			</File>
@@ -1401,6 +1405,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\terraform_cmd.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\timetable_cmd.cpp"
 				>
 			</File>
@@ -1801,6 +1809,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\tunnelbridge_map.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\unmovable_map.h"
 				>
 			</File>

--- a/readme.txt	Fri Nov 23 16:59:30 2007 +0000
+++ b/readme.txt	Wed Jan 09 18:11:12 2008 +0000
@@ -1,6 +1,6 @@
 OpenTTD README
-Last updated:    2007-11-18
-Release version: 0.6.0-beta1
+Last updated:    2007-12-09
+Release version: 0.6.0-beta2
 ------------------------------------------------------------------------
 
 
@@ -281,30 +281,35 @@
 X.X) Credits:
 ---- --------
 The OpenTTD team (in alphabetical order):
-  Jean-Francois Claeys (Belugas) - In training, not yet specialized
-  Bjarni Corfitzen (Bjarni)      - Mac OS X port, coder
-  Matthijs Kooijman (blathijs)   - Pathfinder-guru
+  Jean-Francois Claeys (Belugas) - GUI, newindustries and more
+  Bjarni Corfitzen (Bjarni)      - MacOSX port, coder and vehicles
+  Matthijs Kooijman (blathijs)   - Pathfinder-guru, pool rework
+  Loïc Guilloux (glx)            - General coding
+  Jaroslav Mazanec (KUDr)        - YAPG (Yet Another Pathfinder God) ;)
+  Jonathan Coome (Maedhros)      - High priest of the newGRF Temple
+  Attila Bán (MiHaMiX)           - WebTranslator, Nightlies, Wiki and bugtracker host
+  Owen Rudge (orudge)            - Forum host, OS/2 port
+  Peter Nelson (peter1138)       - Spiritual descendant from newGRF gods
+  Remko Bijker (Rubidium)        - Lead coder and way more
+  Benedikt Brüggemeier (skidd13) - Bug fixer and code reworker
+  Zdenek Sojka (SmatZ)           - Bug finder and fixer
+
+Inactive Developers:
   Victor Fischer (Celestar)      - Programming everywhere you need him to
-  Tamás Faragó (Darkvater)       - Lead programmer
-  Loïc Guilloux (glx)            - In training, not yet specialized
-  Jaroslav Mazanec (KUDr)        - YAPG (Yet Another Pathfinder God) ;)
-  Kerekes Miham (MiHaMiX)        - Maintainer of translator service, and host of nightlies
-  Owen Rudge (orudge)            - Contributor, forum host, OS/2 port
-  Peter Nelson (peter1138)       - Spiritual descendant from newgrf gods
-  Remko Bijker (Rubidium)        - THE desync hunter
+  Tamás Faragó (Darkvater)       - Ex-Lead coder
   Christoph Mallon (Tron)        - Programmer, code correctness police
 
 Retired Developers:
+  Ludvig Strigeus (ludde)        - OpenTTD author, main coder (0.1 - 0.3.3)
+  Serge Paquet (vurlix)          - Assistant project manager, coder (0.1 - 0.3.3)
   Dominik Scherer (dominik81)    - Lead programmer, GUI expert (0.3.0 - 0.3.6)
   Patric Stout (TrueLight)       - Programmer, webhoster (0.3 - pre0.6)
-  Ludvig Strigeus (ludde)        - OpenTTD author, main coder (0.1 - 0.3.3)
-  Serge Paquet (vurlix)          - Assistant project manager, coder (0.1 - 0.3.3)
 
 Thanks to:
   Josef Drexler                  - For his great work on TTDPatch.
   Marcin Grzegorczyk             - For his TTDPatch work and documentation of TTD internals and graphics (signals and track foundations)
   Petr Baudis (pasky)            - Many patches, newgrf support, etc.
-  Simon Sasburg (HackyKid)       - For the many bugfixes he has blessed us with (and future PBS)
+  Simon Sasburg (HackyKid)       - For the many bugfixes he has blessed us with
   Stefan Meißner (sign_de)       - For his work on the console
   Mike Ragsdale                  - OpenTTD installer
   Cian Duffy (MYOB)              - BeOS port / manual writing

--- a/source.list	Fri Nov 23 16:59:30 2007 +0000
+++ b/source.list	Wed Jan 09 18:11:12 2008 +0000
@@ -10,6 +10,7 @@
 command.cpp
 console.cpp
 console_cmds.cpp
+core/bitmath_func.cpp
 core/random_func.cpp
 currency.cpp
 date.cpp
@@ -76,7 +77,7 @@
 texteff.cpp
 tgp.cpp
 thread.cpp
-tile.cpp
+tile_map.cpp
 #if WIN32
 #else
 	#if WINCE
@@ -110,6 +111,7 @@
 cargotype.h
 command.h
 console.h
+core/bitmath_func.hpp
 core/math_func.hpp
 core/random_func.hpp
 currency.h
@@ -132,11 +134,9 @@
 group.h
 gui.h
 heightmap.h
-helpers.hpp
 industry.h
 landscape.h
 livery.h
-macros.h
 map.h
 md5.h
 mixer.h
@@ -193,6 +193,7 @@
 sprite.h
 spritecache.h
 station.h
+station_gui.h
 stdafx.h
 string.h
 texteff.hpp
@@ -267,6 +268,7 @@
 roadveh_cmd.cpp
 ship_cmd.cpp
 station_cmd.cpp
+terraform_cmd.cpp
 timetable_cmd.cpp
 town_cmd.cpp
 train_cmd.cpp
@@ -490,6 +492,7 @@
 tree_map.h
 tunnel_map.cpp
 tunnel_map.h
+tunnelbridge_map.h
 unmovable_map.h
 void_map.h
 water_map.h

--- a/src/ai/ai.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/ai.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -4,10 +4,11 @@
 
 #include "../stdafx.h"
 #include "../openttd.h"
+#include "../player.h"
 #include "../variables.h"
-#include "../command.h"
+#include "../command_func.h"
 #include "../network/network.h"
-#include "../helpers.hpp"
+#include "../core/alloc_func.hpp"
 #include "../debug.h"
 
 #ifndef NO_THREADS

--- a/src/ai/ai_factory.hpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/ai_factory.hpp	Wed Jan 09 18:11:12 2008 +0000
@@ -10,6 +10,7 @@
 #include <assert.h>
 #include "../stdafx.h"
 #include "../functions.h"
+#include "../network/network.h"
 
 class AIController;
 

--- a/src/ai/ai_squirrel.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/ai_squirrel.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -5,7 +5,8 @@
 #include "../stdafx.h"
 #include "../debug.h"
 #include "../openttd.h"
-#include "../string.h"
+#include "../string_func.h"
+#include "../fileio.h"
 #include "../fios.h"
 #include <sys/types.h>
 #include <sys/stat.h>

--- a/src/ai/ai_threads.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/ai_threads.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -8,6 +8,7 @@
 #include "../player.h"
 #include "../debug.h"
 #include "../thread.h"
+#include "../vehicle_func.h"
 #include "ai.h"
 #include "ai_threads.h"
 #include "api/ai_controller.hpp"

--- a/src/ai/api/ai_airport.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_airport.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -1,7 +1,6 @@
 /* $Id$ */
 
 #include "ai_airport.hpp"
-#include "../../command.h"
 #include "../../variables.h"
 #include "../../station_map.h"
 

--- a/src/ai/api/ai_base.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_base.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -3,6 +3,7 @@
 /** @file ai_base.cpp handles the functions of the AIBase class */
 
 #include "ai_base.hpp"
+#include "../../network/network.h"
 
 /* static */ uint32 AIBase::Rand()
 {

--- a/src/ai/api/ai_cargo.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_cargo.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -5,7 +5,8 @@
 #include "ai_cargo.hpp"
 #include "../../cargotype.h"
 #include "../../player.h" // For economy.h
-#include "../../economy.h"
+#include "../../economy_func.h"
+#include "../../core/alloc_func.hpp"
 
 /* static */ bool AICargo::IsValidCargo(CargoID cargo_type)
 {

--- a/src/ai/api/ai_company.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_company.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -3,11 +3,12 @@
 /** @file ai_company.cpp handles the functions of the AICompany class */
 
 #include "ai_company.hpp"
-#include "../../command.h"
+#include "../../command_func.h"
 #include "../../player.h"
-#include "../../economy.h"
-#include "../../strings.h"
+#include "../../economy_func.h"
+#include "../../strings_func.h"
 #include "../../variables.h"
+#include "../../core/alloc_func.hpp"
 #include "table/strings.h"
 
 AICompany::CompanyIndex AICompany::ResolveCompanyIndex(AICompany::CompanyIndex company)

--- a/src/ai/api/ai_engine.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_engine.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -6,8 +6,9 @@
 #include "ai_cargo.hpp"
 #include "../../engine.h"
 #include "../../player.h"
-#include "../../variables.h"
-#include "../../strings.h"
+#include "../../strings_func.h"
+#include "../../core/alloc_func.hpp"
+#include "../../economy_func.h"
 
 /* static */ bool AIEngine::IsValidEngine(EngineID engine_id)
 {

--- a/src/ai/api/ai_industry.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_industry.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -5,8 +5,7 @@
 #include "ai_industry.hpp"
 #include "ai_cargo.hpp"
 #include "../../industry.h"
-#include "../../strings.h"
-#include "../../variables.h" /* For SetDParam */
+#include "../../strings_func.h"
 #include "table/strings.h"
 
 IndustryID AIIndustry::GetMaxIndustryID()

--- a/src/ai/api/ai_industry.hpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_industry.hpp	Wed Jan 09 18:11:12 2008 +0000
@@ -6,6 +6,7 @@
 #define AI_INDUSTRY_HPP
 
 #include "ai_object.hpp"
+#include "../../industry.h"
 
 /**
  * Class that handles all industry related functions.

--- a/src/ai/api/ai_map.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_map.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -3,7 +3,8 @@
 /** @file ai_map.cpp handles the query-related of the AIMap class */
 
 #include "ai_map.hpp"
-#include "../../command.h"
+#include "../../command_type.h"
+#include "../../map_func.h"
 
 /* static */ bool AIMap::IsValidTile(TileIndex t)
 {

--- a/src/ai/api/ai_marine.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_marine.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -1,7 +1,7 @@
 /* $Id$ */
 
 #include "ai_marine.hpp"
-#include "../../command.h"
+#include "../../command_type.h"
 #include "../../variables.h"
 #include "../../station_map.h"
 #include "../../water_map.h"

--- a/src/ai/api/ai_object.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_object.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -3,10 +3,12 @@
 /** @file ai_object.cpp handles the commands-related functions of the AIObject class */
 
 #include "ai_object.hpp"
-#include "../../command.h"
+#include "../../command_func.h"
+#include "../../network/network.h"
 #include "../../player.h"
 #include "table/strings.h" // for signs.h
 #include "../../signs.h" // for _new_sign_id
+#include "../../vehicle_func.h"
 #include "../ai.h"
 #include "../ai_threads.h"
 

--- a/src/ai/api/ai_order.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_order.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -5,9 +5,9 @@
 #include "ai_order.hpp"
 #include "ai_map.hpp"
 #include "ai_vehicle.hpp"
-#include "../../command.h"
+#include "../../command_type.h"
 #include "../../order.h"
-#include "../../vehicle.h"
+#include "../../vehicle_base.h"
 #include "../../depot.h"
 #include "../../landscape.h"
 #include "../../rail_map.h"

--- a/src/ai/api/ai_pathfinder_stupid.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_pathfinder_stupid.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -3,6 +3,7 @@
 #include "ai_pathfinder_stupid.hpp"
 #include "ai_road.hpp"
 #include "ai_testmode.hpp"
+#include "../../map_func.h"
 
 bool AIPathFinderStupid::BuildRealRoute(TileIndex start, TileIndex end, bool continue_on_error)
 {

--- a/src/ai/api/ai_road.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_road.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -3,7 +3,6 @@
 /** @file ai_road.cpp handles the functions of the AIRoad class */
 
 #include "ai_road.hpp"
-#include "../../command.h"
 #include "../../road_map.h"
 #include "../../station_map.h"
 

--- a/src/ai/api/ai_sign.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_sign.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -4,11 +4,12 @@
 
 #include "ai_sign.hpp"
 #include "table/strings.h"
-#include "../../command.h"
+#include "../../command_func.h"
+#include "../../core/alloc_func.hpp"
 #include "../../landscape.h"
 #include "../../signs.h"
-#include "../../strings.h"
-#include "../../variables.h" /* For SetDParam */
+#include "../../strings_func.h"
+#include "../../map_func.h"
 
 SignID AISign::GetMaxSignID()
 {

--- a/src/ai/api/ai_station.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_station.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -8,7 +8,8 @@
 #include "../../station.h"
 #include "../../station_map.h"
 #include "../../variables.h"
-#include "../../strings.h"
+#include "../../strings_func.h"
+#include "../../core/alloc_func.hpp"
 #include "table/strings.h"
 
 /* static */ bool AIStation::IsValidStation(StationID station_id)

--- a/src/ai/api/ai_stationlist.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_stationlist.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -5,7 +5,7 @@
 #include "../../player.h"
 #include "../../station.h"
 #include "../../order.h"
-#include "../../vehicle.h"
+#include "../../vehicle_base.h"
 
 AIStationList::AIStationList(AIStation::StationType type)
 {

--- a/src/ai/api/ai_tile.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_tile.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -3,10 +3,11 @@
 /** @file ai_tile.cpp handles the functions of the AITile class */
 
 #include "ai_tile.hpp"
-#include "../../tile.h"
+#include "../../tile_map.h"
+#include "../../map_func.h"
 #include "../../variables.h"
 #include "../../station.h"
-#include "../../command.h"
+#include "../../command_type.h"
 
 bool AITile::IsBuildable(TileIndex tile)
 {

--- a/src/ai/api/ai_tilelist.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_tilelist.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -5,6 +5,7 @@
 #include "ai_tilelist.hpp"
 
 #include "../../landscape.h"
+#include "../../map_func.h"
 
 void AITileList::FixRectangleSpan(TileIndex &t1, TileIndex &t2)
 {

--- a/src/ai/api/ai_tilelist_valuator.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_tilelist_valuator.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -2,7 +2,6 @@
 #include "ai_tile.hpp"
 #include "ai_road.hpp"
 #include "ai_map.hpp"
-#include "../../tile.h"
 #include "../../road_map.h"
 
 int32 AITileListBuildable::Valuate(int32 tile) const

--- a/src/ai/api/ai_town.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_town.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -4,8 +4,9 @@
 
 #include "ai_town.hpp"
 #include "../../town.h"
-#include "../../strings.h"
-#include "../../variables.h" /* For SetDParam */
+#include "../../strings_func.h"
+#include "../../town_type.h"
+#include "../../core/alloc_func.hpp"
 #include "table/strings.h"
 
 TownID AITown::GetMaxTownID()

--- a/src/ai/api/ai_town.hpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_town.hpp	Wed Jan 09 18:11:12 2008 +0000
@@ -6,6 +6,7 @@
 #define AI_TOWN_HPP
 
 #include "ai_object.hpp"
+#include "../../town_type.h"
 
 /**
  * Class that handles all town related functions.

--- a/src/ai/api/ai_transactionmode.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_transactionmode.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -4,7 +4,7 @@
 
 #include "ai_transactionmode.hpp"
 #include "ai_execmode.hpp"
-#include "../../command.h"
+#include "../../command_func.h"
 #include "../../debug.h"
 #include <stack>
 

--- a/src/ai/api/ai_vehicle.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_vehicle.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -6,13 +6,13 @@
 #include "ai_engine.hpp"
 #include "ai_cargo.hpp"
 #include "ai_order.hpp"
-#include "../../command.h"
-#include "../../vehicle.h"
+#include "../../command_func.h"
 #include "../../depot.h"
 #include "../../engine.h"
 #include "../../player.h"
 #include "../../aircraft.h"
-#include "../../strings.h"
+#include "../../strings_func.h"
+#include "../../core/alloc_func.hpp"
 #include "table/strings.h"
 
 /* static */ bool AIVehicle::IsValidVehicle(VehicleID vehicle_id)

--- a/src/ai/api/ai_vehicle.hpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_vehicle.hpp	Wed Jan 09 18:11:12 2008 +0000
@@ -6,7 +6,7 @@
 #define AI_VEHICLE_HPP
 
 #include "ai_object.hpp"
-#include "../../vehicle.h"
+#include "../../vehicle_type.h"
 
 /**
  * Class that handles all vehicle related functions.

--- a/src/ai/api/ai_vehiclelist.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/ai/api/ai_vehiclelist.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -1,7 +1,7 @@
 #include "ai_vehiclelist.hpp"
 #include "../../player.h"
 #include "../../station.h"
-#include "../../vehicle.h"
+#include "../../vehicle_base.h"
 
 AIVehicleList::AIVehicleList()
 {

--- a/src/aircraft.h	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/aircraft.h	Wed Jan 09 18:11:12 2008 +0000
@@ -6,9 +6,8 @@
 #define AIRCRAFT_H
 
 #include "station_map.h"
-#include "vehicle.h"
+#include "vehicle_base.h"
 #include "engine.h"
-#include "variables.h"
 
 /** An aircraft can be one ot those types */
 enum AircraftSubType {

--- a/src/aircraft_cmd.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/aircraft_cmd.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -7,21 +7,14 @@
 #include "openttd.h"
 #include "aircraft.h"
 #include "debug.h"
-#include "functions.h"
 #include "landscape.h"
 #include "station_map.h"
-#include "strings.h"
 #include "table/strings.h"
-#include "map.h"
-#include "tile.h"
-#include "vehicle.h"
 #include "timetable.h"
 #include "depot.h"
 #include "engine.h"
-#include "command.h"
 #include "station.h"
 #include "news.h"
-#include "sound.h"
 #include "player.h"
 #include "aircraft.h"
 #include "airport.h"
@@ -31,9 +24,19 @@
 #include "newgrf_callbacks.h"
 #include "newgrf_text.h"
 #include "newgrf_sound.h"
-#include "date.h"
 #include "spritecache.h"
 #include "cargotype.h"
+#include "strings_func.h"
+#include "command_func.h"
+#include "window_func.h"
+#include "date_func.h"
+#include "vehicle_func.h"
+#include "sound_func.h"
+#include "functions.h"
+#include "variables.h"
+#include "autoreplace_func.h"
+#include "autoreplace_gui.h"
+#include "gfx_func.h"
 #include "ai/ai.h"
 
 void Aircraft::UpdateDeltaXY(Direction direction)
@@ -163,7 +166,7 @@
 		int sprite = GetCustomVehicleSprite(this, direction);
 
 		if (sprite != 0) return sprite;
-		spritenum = orig_aircraft_vehicle_info[this->engine_type - AIRCRAFT_ENGINES_INDEX].image_index;
+		spritenum = _orig_aircraft_vehicle_info[this->engine_type - AIRCRAFT_ENGINES_INDEX].image_index;
 	}
 	return direction + _aircraft_sprite[spritenum];
 }
@@ -191,7 +194,7 @@
 	if (is_custom_sprite(spritenum)) {
 		sprite = GetCustomVehicleIcon(engine, DIR_W);
 		if (sprite == 0) {
-			spritenum = orig_aircraft_vehicle_info[engine - AIRCRAFT_ENGINES_INDEX].image_index;
+			spritenum = _orig_aircraft_vehicle_info[engine - AIRCRAFT_ENGINES_INDEX].image_index;
 			sprite = (6 + _aircraft_sprite[spritenum]);
 		}
 	}
@@ -219,7 +222,7 @@
 	if (is_custom_sprite(spritenum)) {
 		sprite = GetCustomVehicleIcon(engine, DIR_W);
 		if (sprite == 0) {
-			spritenum = orig_aircraft_vehicle_info[engine - AIRCRAFT_ENGINES_INDEX].image_index;
+			spritenum = _orig_aircraft_vehicle_info[engine - AIRCRAFT_ENGINES_INDEX].image_index;
 			sprite = (6 + _aircraft_sprite[spritenum]);
 		}
 	}
@@ -232,7 +235,7 @@
 
 static CommandCost EstimateAircraftCost(EngineID engine, const AircraftVehicleInfo *avi)
 {
-	return CommandCost(GetEngineProperty(engine, 0x0B, avi->base_cost) * (_price.aircraft_base >> 3) >> 5);
+	return CommandCost(EXPENSES_NEW_VEHICLES, GetEngineProperty(engine, 0x0B, avi->base_cost) * (_price.aircraft_base >> 3) >> 5);
 }
 
 
@@ -280,8 +283,6 @@
 
 	if (!IsHangarTile(tile) || !IsTileOwner(tile, _current_player)) return CMD_ERROR;
 
-	SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES);
-
 	/* Prevent building aircraft types at places which can't handle them */
 	if (!CanAircraftUseStation(p1, tile)) return CMD_ERROR;
 
@@ -490,9 +491,7 @@
 
 	if (HASBITS(v->vehstatus, VS_CRASHED)) return_cmd_error(STR_CAN_T_SELL_DESTROYED_VEHICLE);
 
-	SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES);
-
-	CommandCost ret(-v->value);
+	CommandCost ret(EXPENSES_NEW_VEHICLES, -v->value);
 
 	if (flags & DC_EXEC) {
 		// Invalidate depot
@@ -642,13 +641,12 @@
 
 	if (v->type != VEH_AIRCRAFT || !CheckOwnership(v->owner)) return CMD_ERROR;
 	if (!v->IsStoppedInDepot()) return_cmd_error(STR_A01B_AIRCRAFT_MUST_BE_STOPPED);
+	if (v->vehstatus & VS_CRASHED) return_cmd_error(STR_CAN_T_REFIT_DESTROYED_VEHICLE);
 
 	/* Check cargo */
 	CargoID new_cid = GB(p2, 0, 8);
 	if (new_cid >= NUM_CARGO || !CanRefitTo(v->engine_type, new_cid)) return CMD_ERROR;
 
-	SET_EXPENSES_TYPE(EXPENSES_AIRCRAFT_RUN);
-
 	/* Check the refit capacity callback */
 	uint16 callback = CALLBACK_FAILED;
 	if (HasBit(EngInfo(v->engine_type)->callbackmask, CBM_VEHICLE_REFIT_CAPACITY)) {
@@ -738,11 +736,10 @@
 
 	if (v->vehstatus & VS_STOPPED) return;
 
-	CommandCost cost = CommandCost(GetVehicleProperty(v, 0x0E, AircraftVehInfo(v->engine_type)->running_cost) * _price.aircraft_running / 364);
+	CommandCost cost = CommandCost(EXPENSES_AIRCRAFT_RUN, GetVehicleProperty(v, 0x0E, AircraftVehInfo(v->engine_type)->running_cost) * _price.aircraft_running / 364);
 
 	v->profit_this_year -= cost.GetCost() >> 8;
 
-	SET_EXPENSES_TYPE(EXPENSES_AIRCRAFT_RUN);
 	SubtractMoneyFromPlayerFract(v->owner, cost);
 
 	InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
@@ -1043,7 +1040,17 @@
 		tile = st->xy;
 
 		/* Jump into our "holding pattern" state machine if possible */
-	if (v->u.air.pos >= afc->nofelements) v->u.air.pos = v->u.air.previous_pos = AircraftGetEntryPoint(v, afc);
+		if (v->u.air.pos >= afc->nofelements) {
+			v->u.air.pos = v->u.air.previous_pos = AircraftGetEntryPoint(v, afc);
+		} else if (v->u.air.targetairport != v->current_order.dest) {
+			/* If not possible, just get out of here fast */
+			v->u.air.state = FLYING;
+			UpdateAircraftCache(v);
+			AircraftNextAirportPos_and_Order(v);
+			/* get aircraft back on running altitude */
+			SetAircraftPosition(v, v->x_pos, v->y_pos, GetAircraftFlyingAltitude(v));
+			return false;
+		}
 	}
 
 	/*  get airport moving data */
@@ -1256,7 +1263,7 @@
 
 	if (v->u.air.crashed_counter < 650) {
 		uint32 r;
-		if (CHANCE16R(1,32,r)) {
+		if (Chance16R(1,32,r)) {
 			static const DirDiff delta[] = {
 				DIRDIFF_45LEFT, DIRDIFF_SAME, DIRDIFF_SAME, DIRDIFF_45RIGHT
 			};

--- a/src/aircraft_gui.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/aircraft_gui.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -6,22 +6,17 @@
 #include "openttd.h"
 #include "aircraft.h"
 #include "debug.h"
-#include "functions.h"
 #include "table/sprites.h"
 #include "table/strings.h"
-#include "strings.h"
-#include "map.h"
-#include "window.h"
 #include "gui.h"
-#include "vehicle.h"
-#include "gfx.h"
-#include "command.h"
 #include "engine.h"
-#include "viewport.h"
 #include "player.h"
 #include "depot.h"
 #include "vehicle_gui.h"
 #include "newgrf_engine.h"
+#include "strings_func.h"
+#include "vehicle_func.h"
+#include "gfx_func.h"
 
 /**
 * Draw the details for the given vehicle at the position (x,y)

--- a/src/airport.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/airport.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -5,13 +5,12 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
-#include "map.h"
 #include "airport.h"
-#include "macros.h"
 #include "variables.h"
 #include "airport_movement.h"
-#include "date.h"
-#include "helpers.hpp"
+#include "core/bitmath_func.hpp"
+#include "core/alloc_func.hpp"
+#include "date_func.h"
 
 /* Uncomment this to print out a full report of the airport-structure
  * You should either use
@@ -431,18 +430,6 @@
 	"DUMMY" // extra heading for 255
 };
 
-static uint AirportBlockToString(uint32 block)
-{
-	uint i = 0;
-	if (block & 0xffff0000) { block >>= 16; i += 16; }
-	if (block & 0x0000ff00) { block >>=  8; i +=  8; }
-	if (block & 0x000000f0) { block >>=  4; i +=  4; }
-	if (block & 0x0000000c) { block >>=  2; i +=  2; }
-	if (block & 0x00000002) { i += 1; }
-	return i;
-}
-
-
 static void AirportPrintOut(uint nofelements, const AirportFTA *layout, bool full_report)
 {
 	if (!full_report) printf("(P = Current Position; NP = Next Position)\n");
@@ -453,7 +440,7 @@
 				byte heading = (current->heading == 255) ? MAX_HEADINGS + 1 : current->heading;
 				printf("\tPos:%2d NPos:%2d Heading:%15s Block:%2d\n", current->position,
 					    current->next_position, _airport_heading_strings[heading],
-							AirportBlockToString(current->block));
+							FindLastBit(current->block));
 			} else {
 				printf("P:%2d NP:%2d", current->position, current->next_position);
 			}

--- a/src/airport.h	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/airport.h	Wed Jan 09 18:11:12 2008 +0000
@@ -5,7 +5,8 @@
 #ifndef AIRPORT_H
 #define AIRPORT_H
 
-#include "direction.h"
+#include "direction_type.h"
+#include "map_type.h"
 
 enum {MAX_TERMINALS =  10};
 enum {MAX_HELIPADS  =   4};

--- a/src/airport_gui.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/airport_gui.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -6,18 +6,19 @@
 #include "openttd.h"
 #include "table/sprites.h"
 #include "table/strings.h"
-#include "functions.h"
-#include "map.h"
-#include "window.h"
+#include "window_gui.h"
 #include "gui.h"
-#include "viewport.h"
-#include "gfx.h"
-#include "sound.h"
-#include "command.h"
-#include "vehicle.h"
+#include "station_gui.h"
+#include "terraform_gui.h"
+#include "command_func.h"
 #include "station.h"
 #include "airport.h"
 #include "depot.h"
+#include "sound_func.h"
+#include "window_func.h"
+#include "variables.h"
+#include "viewport_func.h"
+#include "gfx_func.h"
 
 static byte _selected_airport_type;
 
@@ -101,7 +102,7 @@
 		break;
 
 	case WE_ABORT_PLACE_OBJ:
-		RaiseWindowButtons(w);
+		w->RaiseButtons();
 
 		w = FindWindowById(WC_BUILD_STATION, 0);
 		if (w != 0)
@@ -145,9 +146,9 @@
 {
 	switch (e->event) {
 	case WE_CREATE:
-		SetWindowWidgetLoweredState(w, 16, !_station_show_coverage);
-		SetWindowWidgetLoweredState(w, 17, _station_show_coverage);
-		LowerWindowWidget(w, _selected_airport_type + 7);
+		w->SetWidgetLoweredState(16, !_station_show_coverage);
+		w->SetWidgetLoweredState(17, _station_show_coverage);
+		w->LowerWidget(_selected_airport_type + 7);
 		break;
 
 	case WE_PAINT: {
@@ -159,10 +160,10 @@
 
 		avail_airports = GetValidAirports();
 
-		RaiseWindowWidget(w, _selected_airport_type + 7);
+		w->RaiseWidget(_selected_airport_type + 7);
 		if (!HasBit(avail_airports, 0) && _selected_airport_type == AT_SMALL) _selected_airport_type = AT_LARGE;
 		if (!HasBit(avail_airports, 1) && _selected_airport_type == AT_LARGE) _selected_airport_type = AT_SMALL;
-		LowerWindowWidget(w, _selected_airport_type + 7);
+		w->LowerWidget(_selected_airport_type + 7);
 
 		/* 'Country Airport' starts at widget 7, and if its bit is set, it is
 		 * available, so take its opposite value to set the disabled state.
@@ -170,7 +171,7 @@
 		 * XXX TODO : all airports should be held in arrays, with all relevant data.
 		 * This should be part of newgrf-airports, i suppose
 		 */
-		for (i = 0; i < 9; i++) SetWindowWidgetDisabledState(w, i + 7, !HasBit(avail_airports, i));
+		for (i = 0; i < 9; i++) w->SetWidgetDisabledState(i + 7, !HasBit(avail_airports, i));
 
 		// select default the coverage area to 'Off' (16)
 		airport = GetAirport(_selected_airport_type);
@@ -190,16 +191,16 @@
 	case WE_CLICK: {
 		switch (e->we.click.widget) {
 		case 7: case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15:
-			RaiseWindowWidget(w, _selected_airport_type + 7);
+			w->RaiseWidget(_selected_airport_type + 7);
 			_selected_airport_type = e->we.click.widget - 7;
-			LowerWindowWidget(w, _selected_airport_type + 7);
+			w->LowerWidget(_selected_airport_type + 7);
 			SndPlayFx(SND_15_BEEP);
 			SetWindowDirty(w);
 			break;
 		case 16: case 17:
 			_station_show_coverage = (e->we.click.widget != 16);
-			SetWindowWidgetLoweredState(w, 16, !_station_show_coverage);
-			SetWindowWidgetLoweredState(w, 17, _station_show_coverage);
+			w->SetWidgetLoweredState(16, !_station_show_coverage);
+			w->SetWidgetLoweredState(17, _station_show_coverage);
 			SndPlayFx(SND_15_BEEP);
 			SetWindowDirty(w);
 			break;