(svn r20192) -Cleanup: bye bye variables.h, bye bye VARDEF... you won't be missed :)

projects/openttd_vs100.vcxproj

@@ -578,7 +578,6 @@
     <ClInclude Include="..\src\transport_type.h" />
     <ClInclude Include="..\src\tunnelbridge.h" />
     <ClInclude Include="..\src\unmovable.h" />
-    <ClInclude Include="..\src\variables.h" />
     <ClInclude Include="..\src\vehicle_base.h" />
     <ClInclude Include="..\src\vehicle_func.h" />
     <ClInclude Include="..\src\vehicle_gui.h" />

projects/openttd_vs100.vcxproj.filters

@@ -937,9 +937,6 @@
     <ClInclude Include="..\src\unmovable.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\variables.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\vehicle_base.h">
       <Filter>Header Files</Filter>
     </ClInclude>

projects/openttd_vs80.vcproj

@@ -1579,10 +1579,6 @@
 				RelativePath=".\..\src\unmovable.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\variables.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\vehicle_base.h"
 				>

projects/openttd_vs90.vcproj

@@ -1576,10 +1576,6 @@
 				RelativePath=".\..\src\unmovable.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\variables.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\vehicle_base.h"
 				>

source.list

@@ -304,7 +304,6 @@ transparency_gui.h
 transport_type.h
 tunnelbridge.h
 unmovable.h
-variables.h
 vehicle_base.h
 vehicle_func.h
 vehicle_gui.h

src/clear_cmd.cpp

@@ -14,7 +14,6 @@
 #include "clear_map.h"
 #include "command_func.h"
 #include "landscape.h"
-#include "variables.h"
 #include "genworld.h"
 #include "landscape_type.h"
 #include "functions.h"

src/date.cpp

@@ -10,7 +10,6 @@
 /** @file date.cpp Handling of dates in our native format and transforming them to something human readable. */
 
 #include "stdafx.h"
-#include "variables.h"
 #include "network/network.h"
 #include "network/network_func.h"
 #include "currency.h"

src/dedicated.cpp

@@ -17,8 +17,6 @@ char *_log_file; ///< File to reroute output of a forked OpenTTD to
 
 #if defined(UNIX) && !defined(__MORPHOS__)
 
-#include "variables.h"
-
 #include <unistd.h>
 
 #if (defined(SUNOS) && !defined(_LP64) && !defined(_I32LPx)) || defined(__HAIKU__)

src/disaster_cmd.cpp

@@ -32,7 +32,6 @@
 #include "news_func.h"
 #include "town.h"
 #include "company_func.h"
-#include "variables.h"
 #include "strings_func.h"
 #include "date_func.h"
 #include "functions.h"

src/fileio.cpp

@@ -11,7 +11,6 @@
 
 #include "stdafx.h"
 #include "fileio_func.h"
-#include "variables.h"
 #include "debug.h"
 #include "fios.h"
 #include "string_func.h"

src/gamelog.cpp

@@ -13,7 +13,6 @@
 #include "openttd.h"
 #include "saveload/saveload.h"
 #include "core/alloc_func.hpp"
-#include "variables.h"
 #include "string_func.h"
 #include "settings_type.h"
 #include "gamelog_internal.h"

src/genworld.cpp

@@ -13,7 +13,6 @@
 #include "openttd.h"
 #include "landscape.h"
 #include "company_func.h"
-#include "variables.h"
 #include "thread/thread.h"
 #include "command_func.h"
 #include "genworld.h"

src/genworld_gui.cpp

@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "heightmap.h"
-#include "variables.h"
 #include "debug.h"
 #include "genworld.h"
 #include "network/network.h"

src/gfx.cpp

@@ -11,7 +11,6 @@
 
 #include "stdafx.h"
 #include "gfx_func.h"
-#include "variables.h"
 #include "fontcache.h"
 #include "genworld.h"
 #include "zoom_func.h"

src/highscore.cpp

@@ -18,7 +18,6 @@
 #include "strings_func.h"
 #include "table/strings.h"
 #include "core/sort_func.hpp"
-#include "variables.h"
 #include "debug.h"
 
 HighScore _highscore_table[5][5]; // 4 difficulty-settings (+ network); top 5

src/industry_cmd.cpp

@@ -19,7 +19,6 @@
 #include "command_func.h"
 #include "town.h"
 #include "news_func.h"
-#include "variables.h"
 #include "cheat_type.h"
 #include "genworld.h"
 #include "tree_map.h"

src/industry_gui.cpp

@@ -18,7 +18,6 @@
 #include "gfx_func.h"
 #include "industry.h"
 #include "town.h"
-#include "variables.h"
 #include "cheat_type.h"
 #include "newgrf.h"
 #include "newgrf_industries.h"

src/landscape.cpp

@@ -18,7 +18,6 @@
 #include "viewport_func.h"
 #include "command_func.h"
 #include "landscape.h"
-#include "variables.h"
 #include "void_map.h"
 #include "tgp.h"
 #include "genworld.h"

src/misc.cpp

@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "landscape.h"
 #include "news_func.h"
-#include "variables.h"
 #include "ai/ai.hpp"
 #include "ai/ai_gui.hpp"
 #include "newgrf_house.h"

src/music/libtimidity.cpp

@@ -12,7 +12,6 @@
 #include "../stdafx.h"
 #include "../openttd.h"
 #include "../sound_type.h"
-#include "../variables.h"
 #include "../debug.h"
 #include "libtimidity.h"
 #include <fcntl.h>

src/network/network_content.cpp

@@ -16,7 +16,6 @@
 #include "../ai/ai.hpp"
 #include "../window_func.h"
 #include "../gui.h"
-#include "../variables.h"
 #include "../base_media_base.h"
 #include "../settings_type.h"
 #include "network_content.h"

src/newgrf.cpp

@@ -17,7 +17,6 @@
 #include "fileio_func.h"
 #include "engine_func.h"
 #include "engine_base.h"
-#include "variables.h"
 #include "bridge.h"
 #include "town.h"
 #include "newgrf_engine.h"

src/newgrf_airporttiles.cpp

@@ -23,7 +23,6 @@
 #include "landscape.h"
 #include "company_base.h"
 #include "town.h"
-#include "variables.h"
 #include "functions.h"
 #include "core/random_func.hpp"
 #include "table/strings.h"

src/newgrf_house.cpp

@@ -10,7 +10,6 @@
 /** @file newgrf_house.cpp Implementation of NewGRF houses. */
 
 #include "stdafx.h"
-#include "variables.h"
 #include "debug.h"
 #include "viewport_func.h"
 #include "landscape.h"

src/newgrf_industrytiles.cpp

@@ -10,7 +10,6 @@
 /** @file newgrf_industrytiles.cpp NewGRF handling of industry tiles. */
 
 #include "stdafx.h"
-#include "variables.h"
 #include "debug.h"
 #include "viewport_func.h"
 #include "landscape.h"

src/newgrf_railtype.cpp

@@ -4,7 +4,6 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "variables.h"
 #include "debug.h"
 #include "strings_type.h"
 #include "rail.h"

src/newgrf_station.cpp

@@ -10,7 +10,6 @@
 /** @file newgrf_station.cpp Functions for dealing with station classes and custom stations. */
 
 #include "stdafx.h"
-#include "variables.h"
 #include "debug.h"
 #include "station_base.h"
 #include "waypoint_base.h"

src/openttd.cpp

@@ -11,11 +11,6 @@
 
 #include "stdafx.h"
 
-#define VARDEF
-#include "variables.h"
-#undef VARDEF
-
-
 #include "blitter/factory.hpp"
 #include "sound/sound_driver.hpp"
 #include "music/music_driver.hpp"

src/os/macosx/splash.cpp

@@ -11,7 +11,6 @@
 
 #include "../../stdafx.h"
 #include "../../openttd.h"
-#include "../../variables.h"
 #include "../../debug.h"
 #include "../../gfx_func.h"
 #include "../../fileio_func.h"

src/os/os2/os2.cpp

@@ -11,7 +11,6 @@
 
 #include "../../stdafx.h"
 #include "../../openttd.h"
-#include "../../variables.h"
 #include "../../gui.h"
 #include "../../fileio_func.h"
 #include "../../fios.h"

src/rail_cmd.cpp

@@ -23,7 +23,6 @@
 #include "newgrf_railtype.h"
 #include "newgrf_commons.h"
 #include "train.h"
-#include "variables.h"
 #include "autoslope.h"
 #include "water.h"
 #include "tunnelbridge_map.h"

src/road_cmd.cpp

@@ -18,7 +18,6 @@
 #include "pathfinder/yapf/yapf_cache.h"
 #include "depot_base.h"
 #include "newgrf.h"
-#include "variables.h"
 #include "autoslope.h"
 #include "tunnelbridge_map.h"
 #include "window_func.h"

src/saveload/misc_sl.cpp

@@ -11,7 +11,6 @@
 
 #include "../stdafx.h"
 #include "../date_func.h"
-#include "../variables.h"
 #include "../openttd.h"
 #include "../zoom_func.h"
 #include "../vehicle_func.h"

src/saveload/oldloader_sl.cpp

@@ -24,7 +24,6 @@
 #include "../depot_base.h"
 #include "../date_func.h"
 #include "../vehicle_func.h"
-#include "../variables.h"
 #include "../effectvehicle_base.h"
 #include "../core/mem_func.hpp"
 #include "../core/alloc_type.hpp"

src/saveload/saveload.cpp

@@ -26,7 +26,6 @@
 #include "../thread/thread.h"
 #include "../town.h"
 #include "../network/network.h"
-#include "../variables.h"
 #include "../window_func.h"
 #include "../strings_func.h"
 #include "../core/endian_func.hpp"

src/settings.cpp

@@ -25,7 +25,6 @@
 #include "stdafx.h"
 #include "currency.h"
 #include "screenshot.h"
-#include "variables.h"
 #include "network/network.h"
 #include "network/network_func.h"
 #include "settings_internal.h"

src/station_cmd.cpp

@@ -26,7 +26,6 @@
 #include "newgrf_station.h"
 #include "pathfinder/yapf/yapf_cache.h"
 #include "road_internal.h" /* For drawing catenary/checking road removal */
-#include "variables.h"
 #include "autoslope.h"
 #include "water.h"
 #include "station_gui.h"

src/terraform_cmd.cpp

@@ -14,7 +14,6 @@
 #include "command_func.h"
 #include "tunnel_map.h"
 #include "bridge_map.h"
-#include "variables.h"
 #include "functions.h"
 #include "economy_func.h"
 #include "genworld.h"

src/terraform_gui.cpp

@@ -19,7 +19,6 @@
 #include "viewport_func.h"
 #include "command_func.h"
 #include "signs_func.h"
-#include "variables.h"
 #include "functions.h"
 #include "sound_func.h"
 #include "base_station_base.h"

src/toolbar_gui.cpp

@@ -15,7 +15,6 @@
 #include "window_func.h"
 #include "viewport_func.h"
 #include "command_func.h"
-#include "variables.h"
 #include "vehicle_gui.h"
 #include "rail_gui.h"
 #include "road_gui.h"

src/town_cmd.cpp

@@ -22,7 +22,6 @@
 #include "news_func.h"
 #include "gui.h"
 #include "unmovable_map.h"
-#include "variables.h"
 #include "genworld.h"
 #include "newgrf_debug.h"
 #include "newgrf_house.h"

src/town_gui.cpp

@@ -20,7 +20,6 @@
 #include "company_base.h"
 #include "company_gui.h"
 #include "network/network.h"
-#include "variables.h"
 #include "strings_func.h"
 #include "sound_func.h"
 #include "economy_func.h"

src/tree_cmd.cpp

@@ -17,7 +17,6 @@
 #include "command_func.h"
 #include "economy_func.h"
 #include "town.h"
-#include "variables.h"
 #include "genworld.h"
 #include "transparency.h"
 #include "functions.h"

src/tunnelbridge_cmd.cpp

@@ -20,7 +20,6 @@
 #include "cmd_helper.h"
 #include "command_func.h"
 #include "town.h"
-#include "variables.h"
 #include "train.h"
 #include "ship.h"
 #include "roadveh.h"

src/variables.h

@@ -1,19 +0,0 @@
-/* $Id$ */
-
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/** @file variables.h Messing file that will cease to exist some time in the future. */
-
-#ifndef VARIABLES_H
-#define VARIABLES_H
-
-#ifndef VARDEF
-#define VARDEF extern
-#endif
-
-#endif /* VARIABLES_H */

src/video/allegro_v.cpp

@@ -19,7 +19,6 @@
 #include "../stdafx.h"
 #include "../openttd.h"
 #include "../gfx_func.h"
-#include "../variables.h"
 #include "../rev.h"
 #include "../blitter/factory.hpp"
 #include "../network/network.h"

src/video/cocoa/cocoa_v.mm

@@ -26,7 +26,6 @@
 
 #include "../../openttd.h"
 #include "../../debug.h"
-#include "../../variables.h"
 #include "../../core/geometry_type.hpp"
 #include "cocoa_v.h"
 #include "../../blitter/factory.hpp"

src/video/cocoa/event.mm

@@ -26,7 +26,6 @@
 #include "../../openttd.h"
 #include "../../debug.h"
 #include "../../os/macosx/splash.h"
-#include "../../variables.h"
 #include "../../settings_type.h"
 #include "../../core/geometry_type.hpp"
 #include "cocoa_v.h"

src/video/dedicated_v.cpp

@@ -17,7 +17,6 @@
 #include "../network/network.h"
 #include "../network/network_internal.h"
 #include "../console_func.h"
-#include "../variables.h"
 #include "../genworld.h"
 #include "../fileio_type.h"
 #include "../fios.h"

src/video/sdl_v.cpp

@@ -15,7 +15,6 @@
 #include "../openttd.h"
 #include "../gfx_func.h"
 #include "../sdl.h"
-#include "../variables.h"
 #include "../rev.h"
 #include "../blitter/factory.hpp"
 #include "../network/network.h"

src/video/win32_v.cpp

@@ -12,7 +12,6 @@
 #include "../stdafx.h"
 #include "../openttd.h"
 #include "../gfx_func.h"
-#include "../variables.h"
 #include "../os/windows/win32.h"
 #include "../rev.h"
 #include "../blitter/factory.hpp"

src/viewport.cpp

@@ -33,7 +33,6 @@
 #include "town.h"
 #include "signs_base.h"
 #include "signs_func.h"
-#include "variables.h"
 #include "vehicle_base.h"
 #include "vehicle_gui.h"
 #include "blitter/factory.hpp"

src/window.cpp

@@ -17,7 +17,6 @@
 #include "console_func.h"
 #include "console_gui.h"
 #include "viewport_func.h"
-#include "variables.h"
 #include "genworld.h"
 #include "blitter/factory.hpp"
 #include "zoom_func.h"