(svn r11704) -Codechange: remove another bunch of useless includes.
--- a/src/blitter/null.cpp Wed Dec 26 16:38:34 2007 +0000
+++ b/src/blitter/null.cpp Wed Dec 26 23:04:26 2007 +0000
@@ -1,5 +1,8 @@
+/* $Id$ */
+
+/** @file null.cpp A blitter that doesn't blit. */
+
#include "../stdafx.h"
-#include "../variables.h"
#include "null.hpp"
static FBlitter_Null iFBlitter_Null;
--- a/src/cargo_type.h Wed Dec 26 16:38:34 2007 +0000
+++ b/src/cargo_type.h Wed Dec 26 23:04:26 2007 +0000
@@ -1,5 +1,6 @@
/* $Id$ */
-/** @file openttd.h */
+
+/** @file cargo_type.h Types related to cargos... */
#ifndef CARGO_TYPE_H
#define CARGO_TYPE_H
--- a/src/core/random_func.cpp Wed Dec 26 16:38:34 2007 +0000
+++ b/src/core/random_func.cpp Wed Dec 26 23:04:26 2007 +0000
@@ -3,10 +3,11 @@
/** @file random_func.cpp */
#include "../stdafx.h"
-#include "../variables.h"
#include "random_func.hpp"
#include "bitmath_func.hpp"
+uint32 _random_seeds[2][2];
+
uint32 InteractiveRandom()
{
const uint32 s = _random_seeds[1][0];
--- a/src/core/random_func.hpp Wed Dec 26 16:38:34 2007 +0000
+++ b/src/core/random_func.hpp Wed Dec 26 23:04:26 2007 +0000
@@ -100,4 +100,6 @@
return Chance16I(a, b, r);
}
+extern uint32 _random_seeds[2][2];
+
#endif /* RANDOM_FUNC_HPP */
--- a/src/functions.h Wed Dec 26 16:38:34 2007 +0000
+++ b/src/functions.h Wed Dec 26 23:04:26 2007 +0000
@@ -7,7 +7,6 @@
#include "core/random_func.hpp"
#include "command_type.h"
-#include "openttd.h"
#include "tile_cmd.h"
/* clear_land.cpp */
--- a/src/genworld.cpp Wed Dec 26 16:38:34 2007 +0000
+++ b/src/genworld.cpp Wed Dec 26 23:04:26 2007 +0000
@@ -20,6 +20,7 @@
#include "viewport.h"
#include "map_func.h"
#include "date_func.h"
+#include "core/random_func.hpp"
void GenerateClearTile();
void GenerateIndustries();
--- a/src/newgrf_config.h Wed Dec 26 16:38:34 2007 +0000
+++ b/src/newgrf_config.h Wed Dec 26 23:04:26 2007 +0000
@@ -5,7 +5,7 @@
#ifndef NEWGRF_CONFIG_H
#define NEWGRF_CONFIG_H
-#include "openttd.h"
+#include "strings_type.h"
/* GRF config bit flags */
enum GCF_Flags {
--- a/src/npf.h Wed Dec 26 16:38:34 2007 +0000
+++ b/src/npf.h Wed Dec 26 23:04:26 2007 +0000
@@ -5,7 +5,6 @@
#ifndef NPF_H
#define NPF_H
-#include "openttd.h"
#include "aystar.h"
#include "station.h"
#include "vehicle_type.h"
--- a/src/pathfind.h Wed Dec 26 16:38:34 2007 +0000
+++ b/src/pathfind.h Wed Dec 26 23:04:26 2007 +0000
@@ -6,7 +6,6 @@
#define PATHFIND_H
#include "direction_type.h"
-#include "openttd.h"
enum {
STR_FACTOR = 2,
--- a/src/spriteloader/png.cpp Wed Dec 26 16:38:34 2007 +0000
+++ b/src/spriteloader/png.cpp Wed Dec 26 23:04:26 2007 +0000
@@ -7,7 +7,6 @@
#include "../stdafx.h"
#include "../gfx_func.h"
#include "../fileio.h"
-#include "../variables.h"
#include "../debug.h"
#include "../core/alloc_func.hpp"
#include "../core/endian_func.hpp"
--- a/src/tunnelbridge_map.h Wed Dec 26 16:38:34 2007 +0000
+++ b/src/tunnelbridge_map.h Wed Dec 26 23:04:26 2007 +0000
@@ -8,7 +8,6 @@
#include "direction_func.h"
#include "core/bitmath_func.hpp"
#include "tile_map.h"
-#include "openttd.h"
/**
--- a/src/variables.h Wed Dec 26 16:38:34 2007 +0000
+++ b/src/variables.h Wed Dec 26 23:04:26 2007 +0000
@@ -6,7 +6,6 @@
#define VARIABLES_H
#include "yapf/yapf_settings.h"
-#include "openttd.h"
#include "tile_type.h"
#include "strings_type.h"
#include "date_type.h"
@@ -51,8 +50,6 @@
* tick handler. */
VARDEF uint16 _station_tick_ctr;
-VARDEF uint32 _random_seeds[2][2];
-
/* Iterator through all towns in OnTick_Town */
VARDEF uint32 _cur_town_ctr;
/* Frequency iterator at the same place */