Merged with Aethyra master as of 2009-02-09

Conflicts:
	A lot of files...

1 files changed, 1 insertions, 13 deletions

diff --git a/src/net/network.cpp b/src/net/network.cpp
index 941995c9..059da779 100644
--- a/src/net/network.cpp
+++ b/src/net/network.cpp
@@ -26,6 +26,7 @@
 #include "network.h"
 
 #include "../log.h"
+#include "../utils/tostring.h"
 
 /** Warning: buffers and other variables are shared,
     so there can be only one connection active at a time */
@@ -418,19 +419,6 @@ void Network::receive()
     SDLNet_FreeSocketSet(set);
 }
 
-char *iptostring(int address)
-{
-    static char asciiIP[16];
-
-    sprintf(asciiIP, "%i.%i.%i.%i",
-            (unsigned char)(address),
-            (unsigned char)(address >> 8),
-            (unsigned char)(address >> 16),
-            (unsigned char)(address >> 24));
-
-    return asciiIP;
-}
-
 void Network::setError(const std::string& error)
 {
     logger->log("Network error: %s", error.c_str());