summaryrefslogtreecommitdiff
path: root/src/network/network_command.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-10-15 19:58:56 +0000
committerrubidium <rubidium@openttd.org>2010-10-15 19:58:56 +0000
commit9858d699a3c39be2e3a547d59163178012365598 (patch)
treeb0d10b23b4d41471d8ba846ca1805614acfec187 /src/network/network_command.cpp
parentbda26d03b509c3783596c0b3431ca0c8fd7c9990 (diff)
downloadopenttd-9858d699a3c39be2e3a547d59163178012365598.tar.xz
(svn r20935) -Codechange: only let the server side use a pool of connected sockets
Diffstat (limited to 'src/network/network_command.cpp')
-rw-r--r--src/network/network_command.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/network/network_command.cpp b/src/network/network_command.cpp
index 906db5862..ab752455e 100644
--- a/src/network/network_command.cpp
+++ b/src/network/network_command.cpp
@@ -14,6 +14,7 @@
#include "../stdafx.h"
#include "../debug.h"
#include "network_client.h"
+#include "network_server.h"
#include "network.h"
#include "../command_func.h"
#include "../company_func.h"
@@ -179,7 +180,7 @@ void NetworkExecuteLocalCommandQueue()
{
assert(IsLocalCompany());
- CommandQueue &queue = (_network_server ? _local_execution_queue : NetworkClientSocket::Get(0)->incoming_queue);
+ CommandQueue &queue = (_network_server ? _local_execution_queue : ClientNetworkGameSocketHandler::my_client->incoming_queue);
CommandPacket *cp;
while ((cp = queue.Peek()) != NULL) {
@@ -274,7 +275,7 @@ void NetworkDistributeCommands()
* @param cp the struct to write the data to.
* @return an error message. When NULL there has been no error.
*/
-const char *NetworkClientSocket::Recv_Command(Packet *p, CommandPacket *cp)
+const char *NetworkGameSocketHandler::Recv_Command(Packet *p, CommandPacket *cp)
{
cp->company = (CompanyID)p->Recv_uint8();
cp->cmd = p->Recv_uint32();
@@ -299,7 +300,7 @@ const char *NetworkClientSocket::Recv_Command(Packet *p, CommandPacket *cp)
* @param p the packet to send it in.
* @param cp the packet to actually send.
*/
-void NetworkClientSocket::Send_Command(Packet *p, const CommandPacket *cp)
+void NetworkGameSocketHandler::Send_Command(Packet *p, const CommandPacket *cp)
{
p->Send_uint8 (cp->company);
p->Send_uint32(cp->cmd);