Mercurial > hg > openttd
changeset 8142:31f5d2fa3bb7 draft
(svn r11704) -Codechange: remove another bunch of useless includes.
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Wed, 26 Dec 2007 23:04:26 +0000 |
| parents | 4f0b388bfe1b |
| children | 1c7033494d92 |
| files | src/blitter/null.cpp src/cargo_type.h src/core/random_func.cpp src/core/random_func.hpp src/functions.h src/genworld.cpp src/newgrf_config.h src/npf.h src/pathfind.h src/spriteloader/png.cpp src/tunnelbridge_map.h src/variables.h |
| diffstat | 12 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/blitter/null.cpp +++ b/src/blitter/null.cpp @@ -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 +++ b/src/cargo_type.h @@ -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 +++ b/src/core/random_func.cpp @@ -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 +++ b/src/core/random_func.hpp @@ -100,4 +100,6 @@ return Chance16I(a, b, r); } +extern uint32 _random_seeds[2][2]; + #endif /* RANDOM_FUNC_HPP */
--- a/src/functions.h +++ b/src/functions.h @@ -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 +++ b/src/genworld.cpp @@ -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 +++ b/src/newgrf_config.h @@ -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 +++ b/src/npf.h @@ -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 +++ b/src/pathfind.h @@ -6,7 +6,6 @@ #define PATHFIND_H #include "direction_type.h" -#include "openttd.h" enum { STR_FACTOR = 2,
--- a/src/spriteloader/png.cpp +++ b/src/spriteloader/png.cpp @@ -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 +++ b/src/tunnelbridge_map.h @@ -8,7 +8,6 @@ #include "direction_func.h" #include "core/bitmath_func.hpp" #include "tile_map.h" -#include "openttd.h" /**
--- a/src/variables.h +++ b/src/variables.h @@ -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 */