summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-03-31 07:03:35 +0000
committerrubidium <rubidium@openttd.org>2008-03-31 07:03:35 +0000
commit7c759731dcb1a763fce75872c76052ab722c0bba (patch)
tree4dcff2753731c63863bd4bf036f4e82bae1ffb9c
parent6f15d34fe53d317bb50688641cbf4ec48c6c82df (diff)
downloadopenttd-7c759731dcb1a763fce75872c76052ab722c0bba.tar.xz
(svn r12498) -Codechange: bring a little 'order' to openttd.cpp's includes and do not 'define' VARDEF for files that do not have them anymore.
-rw-r--r--src/openttd.cpp47
1 files changed, 25 insertions, 22 deletions
diff --git a/src/openttd.cpp b/src/openttd.cpp
index 2ffecf803..81cfef80d 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -3,21 +3,34 @@
/** @file openttd.cpp */
#include "stdafx.h"
+
#define VARDEF
-#include "debug.h"
-#include "driver.h"
-#include "saveload.h"
+#include "variables.h"
+#include "network/network_internal.h"
+#undef VARDEF
#include "openttd.h"
-#include "mixer.h"
-#include "spritecache.h"
+
+#include "driver.h"
+#include "blitter/factory.hpp"
+#include "sound/sound_driver.hpp"
+#include "music/music_driver.hpp"
+#include "video/video_driver.hpp"
+
+#include "fontcache.h"
#include "gfxinit.h"
+#include "gfx_func.h"
#include "gui.h"
-#include "landscape.h"
+#include "mixer.h"
+#include "sound_func.h"
#include "viewport_func.h"
-#include "gfx_func.h"
#include "window_func.h"
#include "window_gui.h"
+#include "zoom_func.h"
+
+#include "debug.h"
+#include "saveload.h"
+#include "landscape.h"
#include "player_func.h"
#include "player_base.h"
#include "command_func.h"
@@ -31,7 +44,6 @@
#include "console.h"
#include "screenshot.h"
#include "network/network.h"
-#include "network/network_internal.h"
#include "signs.h"
#include "depot.h"
#include "waypoint.h"
@@ -40,25 +52,16 @@
#include "yapf/yapf.h"
#include "settings_func.h"
#include "genworld.h"
-#include "fontcache.h"
-#include "newgrf.h"
-#include "newgrf_config.h"
-#include "newgrf_house.h"
-#include "newgrf_commons.h"
-#include "newgrf_storage.h"
#include "player_face.h"
#include "group.h"
-#include "blitter/factory.hpp"
-#include "sound/sound_driver.hpp"
-#include "music/music_driver.hpp"
-#include "video/video_driver.hpp"
#include "strings_func.h"
-#include "zoom_func.h"
#include "date_func.h"
#include "vehicle_func.h"
-#include "sound_func.h"
-#include "variables.h"
-#include "road_func.h"
+
+#include "newgrf.h"
+#include "newgrf_config.h"
+#include "newgrf_house.h"
+#include "newgrf_commons.h"
#include "newgrf_station.h"
#include "clear_map.h"