From 00c9d3ef20c83df43118a9ace5b8dd8eca26a126 Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 25 Dec 2007 09:48:53 +0000 Subject: (svn r11691) -Codechange: move+rename helpers.hpp and only include it when it is really needed. --- src/network/core/packet.cpp | 1 - src/network/core/tcp.cpp | 1 - src/network/core/udp.cpp | 1 + src/network/network_client.cpp | 2 +- src/network/network_data.cpp | 2 +- src/network/network_gamelist.cpp | 2 +- src/network/network_gui.cpp | 1 - src/network/network_server.cpp | 2 +- 8 files changed, 5 insertions(+), 7 deletions(-) (limited to 'src/network') diff --git a/src/network/core/packet.cpp b/src/network/core/packet.cpp index 21c6b5ba6..d31375183 100644 --- a/src/network/core/packet.cpp +++ b/src/network/core/packet.cpp @@ -8,7 +8,6 @@ #include "../../stdafx.h" #include "../../string.h" -#include "../../helpers.hpp" #include "packet.h" diff --git a/src/network/core/tcp.cpp b/src/network/core/tcp.cpp index 1520a55f4..deb72a60b 100644 --- a/src/network/core/tcp.cpp +++ b/src/network/core/tcp.cpp @@ -16,7 +16,6 @@ #include "../network_data.h" #include "packet.h" #include "tcp.h" -#include "../../helpers.hpp" /** Very ugly temporary hack !!! */ void NetworkTCPSocketHandler::Initialize() diff --git a/src/network/core/udp.cpp b/src/network/core/udp.cpp index 58c586813..8cd22ce62 100644 --- a/src/network/core/udp.cpp +++ b/src/network/core/udp.cpp @@ -10,6 +10,7 @@ #include "../../debug.h" #include "../../core/bitmath_func.hpp" #include "../../core/math_func.hpp" +#include "../../core/alloc_func.hpp" #include "packet.h" #include "udp.h" diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp index ed47953ed..e1ac2d5c5 100644 --- a/src/network/network_client.cpp +++ b/src/network/network_client.cpp @@ -19,7 +19,7 @@ #include "../console.h" #include "../variables.h" #include "../ai/ai.h" -#include "../helpers.hpp" +#include "../core/alloc_func.hpp" #include "../fileio.h" #include "../md5.h" #include "../strings_func.h" diff --git a/src/network/network_data.cpp b/src/network/network_data.cpp index 8dddce4bf..8e525cec9 100644 --- a/src/network/network_data.cpp +++ b/src/network/network_data.cpp @@ -9,7 +9,7 @@ #include "network_client.h" #include "../command_func.h" #include "../callback_table.h" -#include "../helpers.hpp" +#include "../core/alloc_func.hpp" // Add a command to the local command queue void NetworkAddCommandQueue(NetworkTCPSocketHandler *cs, CommandPacket *cp) diff --git a/src/network/network_gamelist.cpp b/src/network/network_gamelist.cpp index ade47801c..91c469537 100644 --- a/src/network/network_gamelist.cpp +++ b/src/network/network_gamelist.cpp @@ -10,7 +10,7 @@ #include "../stdafx.h" #include "../debug.h" #include "../newgrf_config.h" -#include "../helpers.hpp" +#include "../core/alloc_func.hpp" #include "core/game.h" #include "network_udp.h" #include "network_gamelist.h" diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 20e8f18a9..485db74d4 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -26,7 +26,6 @@ #include "../string.h" #include "../town.h" #include "../newgrf.h" -#include "../helpers.hpp" #define BGC 5 #define BTC 15 diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp index 5406f9d06..47cd19228 100644 --- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -23,7 +23,7 @@ #include "../station.h" #include "../variables.h" #include "../genworld.h" -#include "../helpers.hpp" +#include "../core/alloc_func.hpp" #include "../fileio.h" // This file handles all the server-commands -- cgit v1.2.3-54-g00ecf