From 429521a7d1f549ba3f9a287885c42f400f5e960f Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 25 Dec 2007 11:26:07 +0000 Subject: (svn r11692) -Codechange: move some functions from 'functions.h' to a more logical place and remove about 50% of the includes of 'functions.h' --- src/network/core/tcp.cpp | 1 - src/network/network.cpp | 3 ++- src/network/network_client.cpp | 2 +- src/network/network_gui.cpp | 3 ++- src/network/network_server.cpp | 1 - 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/network') diff --git a/src/network/core/tcp.cpp b/src/network/core/tcp.cpp index deb72a60b..eaed4bd07 100644 --- a/src/network/core/tcp.cpp +++ b/src/network/core/tcp.cpp @@ -11,7 +11,6 @@ #include "../../openttd.h" #include "../../variables.h" #include "table/strings.h" -#include "../../functions.h" #include "../network_data.h" #include "packet.h" diff --git a/src/network/network.cpp b/src/network/network.cpp index d0558c4b7..b746cbbe3 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -9,7 +9,6 @@ extern const char _openttd_revision[]; #include "../openttd.h" #include "../debug.h" -#include "../functions.h" #include "../string.h" #include "../strings_func.h" #include "../map.h" @@ -31,6 +30,8 @@ extern const char _openttd_revision[]; #include "../md5.h" #include "../fileio.h" #include "../texteff.hpp" +#include "../core/random_func.hpp" +#include "../window_func.h" /* Check whether NETWORK_NUM_LANDSCAPES is still in sync with NUM_LANDSCAPE */ assert_compile((int)NETWORK_NUM_LANDSCAPES == (int)NUM_LANDSCAPE); diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp index e1ac2d5c5..df70842d7 100644 --- a/src/network/network_client.cpp +++ b/src/network/network_client.cpp @@ -10,7 +10,6 @@ #include "core/tcp.h" #include "../date.h" #include "table/strings.h" -#include "../functions.h" #include "network_client.h" #include "network_gamelist.h" #include "network_gui.h" @@ -23,6 +22,7 @@ #include "../fileio.h" #include "../md5.h" #include "../strings_func.h" +#include "../window_func.h" // This file handles all the client-commands diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 485db74d4..8fab465c1 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -11,7 +11,6 @@ #include "../fios.h" #include "table/strings.h" -#include "../functions.h" #include "network_data.h" #include "network_client.h" #include "network_gui.h" @@ -26,6 +25,8 @@ #include "../string.h" #include "../town.h" #include "../newgrf.h" +#include "../functions.h" +#include "../window_func.h" #define BGC 5 #define BTC 15 diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp index 47cd19228..d1719629e 100644 --- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -13,7 +13,6 @@ #include "../aircraft.h" #include "../date.h" #include "table/strings.h" -#include "../functions.h" #include "network_server.h" #include "network_udp.h" #include "../console.h" -- cgit v1.2.3-54-g00ecf