summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-01-07 14:23:25 +0000
committerrubidium <rubidium@openttd.org>2008-01-07 14:23:25 +0000
commita3ccdcea3663963939f75a9cc842f915b8e49767 (patch)
treed691be4529ae6acb6f5b7682aec3ff759e342438 /src/network
parent38115acf5adbcf66643d1f96e30b9abc6dec15a3 (diff)
downloadopenttd-a3ccdcea3663963939f75a9cc842f915b8e49767.tar.xz
(svn r11777) -Codechange: split the string header and make do not include it when it's not necessary.
Diffstat (limited to 'src/network')
-rw-r--r--src/network/core/packet.cpp2
-rw-r--r--src/network/network.cpp2
-rw-r--r--src/network/network_client.cpp2
-rw-r--r--src/network/network_data.cpp2
-rw-r--r--src/network/network_gui.cpp3
-rw-r--r--src/network/network_server.cpp2
-rw-r--r--src/network/network_udp.cpp2
7 files changed, 7 insertions, 8 deletions
diff --git a/src/network/core/packet.cpp b/src/network/core/packet.cpp
index d31375183..fe4c1f774 100644
--- a/src/network/core/packet.cpp
+++ b/src/network/core/packet.cpp
@@ -7,7 +7,7 @@
#ifdef ENABLE_NETWORK
#include "../../stdafx.h"
-#include "../../string.h"
+#include "../../string_func.h"
#include "packet.h"
diff --git a/src/network/network.cpp b/src/network/network.cpp
index 59f11fa39..625c04821 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 "../string.h"
#include "../strings_func.h"
#include "../map_func.h"
#include "../command_func.h"
@@ -32,6 +31,7 @@ extern const char _openttd_revision[];
#include "../texteff.hpp"
#include "../core/random_func.hpp"
#include "../window_func.h"
+#include "../string_func.h"
#ifdef DEBUG_DUMP_COMMANDS
#include "../core/alloc_func.hpp"
#endif
diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index badfde557..8c3b91b0c 100644
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -4,7 +4,6 @@
#include "../stdafx.h"
#include "../debug.h"
-#include "../string.h"
#include "../openttd.h"
#include "network_data.h"
#include "core/tcp.h"
@@ -22,6 +21,7 @@
#include "../md5.h"
#include "../strings_func.h"
#include "../window_func.h"
+#include "../string_func.h"
// This file handles all the client-commands
diff --git a/src/network/network_data.cpp b/src/network/network_data.cpp
index 6cb8e1d47..28d6c0984 100644
--- a/src/network/network_data.cpp
+++ b/src/network/network_data.cpp
@@ -5,11 +5,11 @@
#include "../stdafx.h"
#include "../debug.h"
#include "network_data.h"
-#include "../string.h"
#include "network_client.h"
#include "../command_func.h"
#include "../callback_table.h"
#include "../core/alloc_func.hpp"
+#include "../string_func.h"
// Add a command to the local command queue
void NetworkAddCommandQueue(NetworkTCPSocketHandler *cs, CommandPacket *cp)
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index 7b13a6572..a15718057 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -3,7 +3,6 @@
#ifdef ENABLE_NETWORK
#include "../stdafx.h"
#include "../openttd.h"
-#include "../string.h"
#include "../strings_func.h"
#include "../table/sprites.h"
#include "network.h"
@@ -21,12 +20,12 @@
#include "../variables.h"
#include "network_server.h"
#include "network_udp.h"
-#include "../string.h"
#include "../town.h"
#include "../newgrf.h"
#include "../functions.h"
#include "../window_func.h"
#include "../core/alloc_func.hpp"
+#include "../string_func.h"
#define BGC 5
#define BTC 15
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index 40220e254..21f14356f 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -5,7 +5,6 @@
#include "../stdafx.h"
#include "../openttd.h" // XXX StringID
#include "../debug.h"
-#include "../string.h"
#include "../strings_func.h"
#include "network_data.h"
#include "core/tcp.h"
@@ -23,6 +22,7 @@
#include "../genworld.h"
#include "../core/alloc_func.hpp"
#include "../fileio.h"
+#include "../string_func.h"
// This file handles all the server-commands
diff --git a/src/network/network_udp.cpp b/src/network/network_udp.cpp
index 573acadfa..741e83b40 100644
--- a/src/network/network_udp.cpp
+++ b/src/network/network_udp.cpp
@@ -11,7 +11,6 @@
#include "../stdafx.h"
#include "../debug.h"
-#include "../string.h"
#include "network_data.h"
#include "../date_func.h"
#include "../map_func.h"
@@ -20,6 +19,7 @@
#include "../variables.h"
#include "../newgrf_config.h"
#include "../core/endian_func.hpp"
+#include "../string_func.h"
#include "core/udp.h"