(svn r2673) Include functions.h directly, not globally via openttd.h

ai_build.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "command.h"

ai_new.c

@@ -18,6 +18,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "table/strings.h"
 #include "map.h"
 #include "tile.h"

ai_old.c

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "player.h"

ai_pathfinder.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "command.h"

aircraft_cmd.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "table/strings.h"
 #include "map.h"
 #include "tile.h"

aircraft_gui.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "map.h"

airport_gui.c

@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "table/sprites.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "window.h"
 #include "gui.h"

bridge_gui.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "window.h"
 #include "gui.h"

callback_table.h

@@ -1,6 +1,8 @@
 #ifndef CALLBACK_TABLE_H
 #define CALLBACK_TABLE_H
 
+#include "functions.h"
+
 extern CommandCallback *_callback_table[];
 extern const int _callback_table_count;
 

clear_cmd.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "player.h"
 #include "tile.h"

command.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "gui.h"
 #include "command.h"

console.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "window.h"
 #include "gui.h"
 #include "gfx.h"

debug.c

@@ -4,6 +4,7 @@
 #include "openttd.h"
 #include "console.h"
 #include "debug.h"
+#include "functions.h"
 #include "string.h"
 
 int _debug_ai_level;

dedicated.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "network.h"
 #include "hal.h"
 

depot.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "depot.h"
+#include "functions.h"
 #include "tile.h"
 #include "map.h"
 #include "table/strings.h"

disaster_cmd.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "vehicle.h"

dock_gui.c

@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "table/sprites.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "window.h"
 #include "station.h"

dummy_land.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "viewport.h"
 #include "command.h"
 

economy.c

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "strings.h" // XXX InjectDParam()
 #include "table/strings.h"
 #include "map.h"

engine.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "table/strings.h"
 #include "engine.h"
 #include "table/engines.h"

engine_gui.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"

fileio.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "fileio.h"
+#include "functions.h"
 #include "macros.h"
 #include "variables.h"
 #if defined(UNIX) || defined(__OS2__)

gfx.c

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "player.h"
 #include "spritecache.h"
 #include "strings.h"

graph_gui.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "window.h"
 #include "gui.h"
 #include "gfx.h"

industry_cmd.c

@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "table/strings.h"
 #include "table/sprites.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "viewport.h"

industry_gui.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "strings.h"
 #include "table/strings.h"
 #include "table/sprites.h"

intro_gui.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"

landscape.c

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "map.h"
 #include "player.h"
 #include "spritecache.h"

main_gui.c

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "spritecache.h"
 #include "strings.h"
 #include "table/sprites.h"

misc.c

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "string.h"
 #include "strings.h" // XXX GetParam*
 #include "table/strings.h"

misc_cmd.c

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "string.h"
 #include "table/strings.h"
 #include "command.h"

misc_gui.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "saveload.h"
 #include "spritecache.h"
 #include "strings.h"

music_gui.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "window.h"
 #include "gui.h"
 #include "gfx.h"

network.c

@@ -1,5 +1,7 @@
 #include "stdafx.h"
+#include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "string.h"
 #include "strings.h"
 #include "map.h"

network_client.c

@@ -7,6 +7,7 @@
 #ifdef ENABLE_NETWORK
 
 #include "table/strings.h"
+#include "functions.h"
 #include "network_client.h"
 #include "network_gamelist.h"
 #include "saveload.h"

network_data.c

@@ -5,6 +5,7 @@
 // Is the network enabled?
 #ifdef ENABLE_NETWORK
 
+#include "functions.h"
 #include "string.h"
 #include "table/strings.h"
 #include "network_client.h"

network_gui.c

@@ -10,13 +10,13 @@
 #ifdef ENABLE_NETWORK
 
 #include "table/strings.h"
+#include "functions.h"
 #include "network_data.h"
 #include "network_gamelist.h"
 #include "window.h"
 #include "gui.h"
 #include "gfx.h"
 #include "command.h"
-#include "functions.h"
 #include "variables.h"
 #include "network_server.h"
 #include "network_udp.h"

network_server.c

@@ -7,6 +7,7 @@
 #ifdef ENABLE_NETWORK
 
 #include "table/strings.h"
+#include "functions.h"
 #include "network_server.h"
 #include "network_udp.h"
 #include "console.h"

newgrf.c

@@ -6,6 +6,7 @@
 #include "debug.h"
 #include "gfx.h"
 #include "fileio.h"
+#include "functions.h"
 #include "engine.h"
 #include "station.h"
 #include "sprite.h"

news_gui.c

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "strings.h"
 #include "table/sprites.h"
 #include "table/strings.h"

npf.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "npf.h"
 #include "aystar.h"
 #include "macros.h"

oldloader.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "town.h"
 #include "industry.h"

openttd.c

@@ -9,6 +9,7 @@
 
 #define VARDEF
 #include "openttd.h"
+#include "functions.h"
 #include "mixer.h"
 #include "spritecache.h"
 #include "gfx.h"

openttd.h

@@ -547,6 +547,4 @@ enum {
 };
 VARDEF byte _no_scroll;
 
-#include "functions.h"
-
 #endif /* OPENTTD_H */

order_cmd.c

@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "airport.h"
 #include "depot.h"
+#include "functions.h"
 #include "table/strings.h"
 #include "vehicle.h"
 #include "waypoint.h"

order_gui.c

@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "table/sprites.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "window.h"

pathfind.c

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "pathfind.h"

pbs.c

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
-#include "pbs.h"
 #include "functions.h"
+#include "pbs.h"
 #include "debug.h"
 #include "map.h"
 #include "tile.h"

player_gui.c

@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "table/sprites.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"

players.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "engine.h"
+#include "functions.h"
 #include "string.h"
 #include "strings.h"
 #include "table/strings.h"

pool.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "pool.h"
 
 /**

rail_cmd.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "map.h"

rail_gui.c

@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "table/sprites.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "window.h"

road_cmd.c

@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "table/sprites.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "vehicle.h"

road_gui.c

@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "table/sprites.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "window.h"

roadveh_cmd.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "table/strings.h"
 #include "map.h"
 #include "tile.h"

roadveh_gui.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "map.h"

saveload.c

@@ -16,6 +16,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "vehicle.h"
 #include "station.h"
 #include "town.h"

screenshot.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "strings.h"
 #include "table/strings.h"
 #include "gfx.h"

sdl.c

@@ -3,6 +3,7 @@
 #if defined(WITH_SDL)
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "gfx.h"
 #include "mixer.h"
 #include "window.h"

settings.c

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "screenshot.h"
 #include "sound.h"
 #include "spritecache.h"

settings_gui.c

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "string.h"
 #include "strings.h" // XXX GetCurrentCurrencyRate()
 #include "table/sprites.h"

ship_cmd.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "vehicle.h"

ship_gui.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "table/strings.h"
 #include "map.h"
 #include "window.h"

signs.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "player.h"
 #include "signs.h"
 #include "saveload.h"

smallmap_gui.c

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "spritecache.h"
 #include "table/strings.h"
 #include "table/sprites.h"

sound.c

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "map.h"
 #include "mixer.h"
 #include "sound.h"

spritecache.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "gfx.h"
 #include "spritecache.h"
 #include "table/sprites.h"

station_cmd.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "map.h"

station_gui.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "strings.h"
 #include "table/strings.h"
 #include "window.h"

strings.c

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "string.h"
 #include "strings.h"
 #include "table/strings.h"

subsidy_gui.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "window.h"
 #include "gui.h"
 #include "station.h"

terraform_gui.c

@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "table/sprites.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "player.h"
 #include "tile.h"
 #include "window.h"

texteff.c

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "strings.h"
 #include "gfx.h"
 #include "viewport.h"

town_cmd.c

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "strings.h"
 #include "table/strings.h"
 #include "table/sprites.h"

town_gui.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "strings.h"
 #include "table/sprites.h"
 #include "table/strings.h"

train_cmd.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "table/strings.h"
 #include "map.h"
 #include "tile.h"

train_gui.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "map.h"

tree_cmd.c

@@ -3,6 +3,7 @@
 #include "table/strings.h"
 #include "table/sprites.h"
 #include "table/tree_land.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "viewport.h"

tunnelbridge_cmd.c

@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "table/sprites.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "vehicle.h"

unix.c

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "window.h"
 #include "string.h"
 #include "table/strings.h"

unmovable_cmd.c

@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "table/strings.h"
 #include "table/sprites.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "command.h"

vehicle.c

@@ -3,6 +3,7 @@
 #include "spritecache.h"
 #include "table/sprites.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "vehicle.h"

vehicle_gui.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "player.h"
 #include "strings.h"
 #include "table/sprites.h"

viewport.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "spritecache.h"
 #include "strings.h"
 #include "table/sprites.h"

water_cmd.c

@@ -2,6 +2,7 @@
 #include "openttd.h"
 #include "table/sprites.h"
 #include "table/strings.h"
+#include "functions.h"
 #include "map.h"
 #include "tile.h"
 #include "vehicle.h"

waypoint.c

@@ -2,6 +2,7 @@
 #include "openttd.h"
 
 #include "command.h"
+#include "functions.h"
 #include "gfx.h"
 #include "map.h"
 #include "order.h"

widget.c

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
+#include "functions.h"
 #include "player.h"
 #include "table/sprites.h"
 #include "table/strings.h"

win32.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "saveload.h"
 #include "string.h"
 #include "table/strings.h"

window.c

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "functions.h"
 #include "map.h"
 #include "player.h"
 #include "window.h"