From 830565514c380c7d6f97be169d9388f8f5bd860e Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 13 Feb 2005 11:18:02 +0000 Subject: [PATCH] (svn r1867) Include tables/sprites.h only in files which need it --- airport_gui.c | 1 + dock_gui.c | 1 + landscape.c | 1 + main_gui.c | 1 + misc_gui.c | 1 + network_gui.c | 1 + order_gui.c | 1 + player_gui.c | 1 + rail_cmd.c | 1 + rail_gui.c | 1 + road_gui.c | 1 + settings_gui.c | 1 + spritecache.c | 1 + station_cmd.c | 1 + terraform_gui.c | 1 + town_gui.c | 1 + ttd.h | 4 ---- tunnelbridge_cmd.c | 1 + vehicle_gui.c | 1 + viewport.c | 1 + water_cmd.c | 1 + widget.c | 1 + 22 files changed, 21 insertions(+), 4 deletions(-) diff --git a/airport_gui.c b/airport_gui.c index 7757b8ac9b..f807ed2eea 100644 --- a/airport_gui.c +++ b/airport_gui.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/sprites.h" #include "table/strings.h" #include "map.h" #include "window.h" diff --git a/dock_gui.c b/dock_gui.c index cc59fd1f91..ae7ee3b461 100644 --- a/dock_gui.c +++ b/dock_gui.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/sprites.h" #include "table/strings.h" #include "map.h" #include "window.h" diff --git a/landscape.c b/landscape.c index e406c76fa3..e3cb79a5c4 100644 --- a/landscape.c +++ b/landscape.c @@ -2,6 +2,7 @@ #include "ttd.h" #include "map.h" #include "spritecache.h" +#include "table/sprites.h" #include "tile.h" #include #include "gfx.h" diff --git a/main_gui.c b/main_gui.c index 37af61068b..a6be5e26ae 100644 --- a/main_gui.c +++ b/main_gui.c @@ -2,6 +2,7 @@ #include "ttd.h" #include "spritecache.h" #include "strings.h" +#include "table/sprites.h" #include "table/strings.h" #include "map.h" #include "tile.h" diff --git a/misc_gui.c b/misc_gui.c index c24197fdfd..8ec60e4a02 100644 --- a/misc_gui.c +++ b/misc_gui.c @@ -3,6 +3,7 @@ #include "debug.h" #include "spritecache.h" #include "strings.h" +#include "table/sprites.h" #include "table/strings.h" #include "map.h" #include "window.h" diff --git a/network_gui.c b/network_gui.c index 1dc06c0f41..d2f1bd3457 100644 --- a/network_gui.c +++ b/network_gui.c @@ -2,6 +2,7 @@ #include "ttd.h" #include "string.h" #include "strings.h" +#include "table/sprites.h" #include "network.h" #include "saveload.h" diff --git a/order_gui.c b/order_gui.c index b0d88d03e1..ebc51c93fc 100644 --- a/order_gui.c +++ b/order_gui.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/sprites.h" #include "table/strings.h" #include "map.h" #include "tile.h" diff --git a/player_gui.c b/player_gui.c index dbe25ea34f..c4910b327e 100644 --- a/player_gui.c +++ b/player_gui.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/sprites.h" #include "table/strings.h" #include "window.h" #include "gui.h" diff --git a/rail_cmd.c b/rail_cmd.c index 845d6d8d08..0c22b0048a 100644 --- a/rail_cmd.c +++ b/rail_cmd.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/sprites.h" #include "table/strings.h" #include "gfx.h" #include "map.h" diff --git a/rail_gui.c b/rail_gui.c index a49ded5caa..8ad66440d2 100644 --- a/rail_gui.c +++ b/rail_gui.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/sprites.h" #include "table/strings.h" #include "map.h" #include "tile.h" diff --git a/road_gui.c b/road_gui.c index 2c3158c1ec..b7efcebd39 100644 --- a/road_gui.c +++ b/road_gui.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/sprites.h" #include "table/strings.h" #include "map.h" #include "tile.h" diff --git a/settings_gui.c b/settings_gui.c index 2aee5f8860..4db9380562 100644 --- a/settings_gui.c +++ b/settings_gui.c @@ -2,6 +2,7 @@ #include "ttd.h" #include "string.h" #include "strings.h" // XXX GetCurrentCurrencyRate() +#include "table/sprites.h" #include "table/strings.h" #include "window.h" #include "gui.h" diff --git a/spritecache.c b/spritecache.c index bcf9ec4d3e..ada918bb34 100644 --- a/spritecache.c +++ b/spritecache.c @@ -3,6 +3,7 @@ #include "debug.h" #include "gfx.h" #include "spritecache.h" +#include "table/sprites.h" #include "fileio.h" #include "newgrf.h" #include "md5.h" diff --git a/station_cmd.c b/station_cmd.c index c4d9854b28..d60f4acafb 100644 --- a/station_cmd.c +++ b/station_cmd.c @@ -1,6 +1,7 @@ #include "stdafx.h" #include "ttd.h" #include "debug.h" +#include "table/sprites.h" #include "table/strings.h" #include "map.h" #include "tile.h" diff --git a/terraform_gui.c b/terraform_gui.c index 440cd9691e..0221786e8e 100644 --- a/terraform_gui.c +++ b/terraform_gui.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/sprites.h" #include "table/strings.h" #include "window.h" #include "gui.h" diff --git a/town_gui.c b/town_gui.c index 8b4cb6f1be..f55c4d2ed7 100644 --- a/town_gui.c +++ b/town_gui.c @@ -2,6 +2,7 @@ #include "ttd.h" #include "debug.h" #include "strings.h" +#include "table/sprites.h" #include "table/strings.h" #include "town.h" #include "window.h" diff --git a/ttd.h b/ttd.h index 1928e5099b..71b968376d 100644 --- a/ttd.h +++ b/ttd.h @@ -1,10 +1,6 @@ #ifndef TTD_H #define TTD_H -// FIXME: Include only where really needed. -// include sprites -#include "table/sprites.h" - #ifndef VARDEF #define VARDEF extern #endif diff --git a/tunnelbridge_cmd.c b/tunnelbridge_cmd.c index 95cc74dc78..a639bc6730 100644 --- a/tunnelbridge_cmd.c +++ b/tunnelbridge_cmd.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/sprites.h" #include "table/strings.h" #include "map.h" #include "tile.h" diff --git a/vehicle_gui.c b/vehicle_gui.c index 2a932380d0..1254c6f411 100644 --- a/vehicle_gui.c +++ b/vehicle_gui.c @@ -2,6 +2,7 @@ #include "ttd.h" #include "debug.h" #include "strings.h" +#include "table/sprites.h" #include "table/strings.h" #include "vehicle.h" #include "window.h" diff --git a/viewport.c b/viewport.c index 726a053a19..96b3bb1777 100644 --- a/viewport.c +++ b/viewport.c @@ -3,6 +3,7 @@ #include "debug.h" #include "spritecache.h" #include "strings.h" +#include "table/sprites.h" #include "table/strings.h" #include "map.h" #include "viewport.h" diff --git a/water_cmd.c b/water_cmd.c index 263a482bd1..05f48e0be4 100644 --- a/water_cmd.c +++ b/water_cmd.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/sprites.h" #include "table/strings.h" #include "map.h" #include "tile.h" diff --git a/widget.c b/widget.c index cba4b3cc63..6add3e7ffc 100644 --- a/widget.c +++ b/widget.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/sprites.h" #include "table/strings.h" #include "window.h" #include "gfx.h"