From 33e19fb0822308a630ca6e1122b9b97882a120a7 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Tue, 25 Jul 2006 19:21:22 +0000 Subject: Fixed Linux compiling issues and merged update system fix for Windows. --- src/net/network.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/net/network.cpp') diff --git a/src/net/network.cpp b/src/net/network.cpp index 8278e266..aa18e888 100644 --- a/src/net/network.cpp +++ b/src/net/network.cpp @@ -40,13 +40,13 @@ Network::~Network() { clearHandlers(); - if (mState != IDLE && mState != ERROR) + if (mState != IDLE && mState != NET_ERROR) disconnect(); } bool Network::connect(const std::string &address, short port) { - if (mState != IDLE && mState != ERROR) + if (mState != IDLE && mState != NET_ERROR) { logger->log("Tried to connect an already connected socket!"); return false; @@ -55,7 +55,7 @@ bool Network::connect(const std::string &address, short port) if (address.empty()) { logger->log("Empty address given to Network::connect()!"); - mState = ERROR; + mState = NET_ERROR; return false; } @@ -84,7 +84,7 @@ bool Network::connect(const std::string &address, short port) if (mServer == 0) { logger->log("Unable to initiate connection to the server."); - mState = ERROR; + mState = NET_ERROR; return false; } -- cgit v1.2.3-60-g2f50