Reworked the inventory move handling code, hopefully fixed more problems than caused

[oweals/minetest.git] / src / socket.cpp

diff --git a/src/socket.cpp b/src/socket.cpp
index a7d20404707d977f7ea19f952b797768db7ca8b7..6d48178f963504c24075e270bc945da31ef3a25f 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -97,13 +97,13 @@ void Address::Resolve(const char *name)
        freeaddrinfo(resolved);
 }
 
-std::string Address::serializeString()
+std::string Address::serializeString() const
 {
        unsigned int a, b, c, d;
-       a = (m_address && 0xFF000000)>>24;
-       b = (m_address && 0x00FF0000)>>16;
-       c = (m_address && 0x0000FF00)>>8;
-       d = (m_address && 0x000000FF);
+       a = (m_address & 0xFF000000)>>24;
+       b = (m_address & 0x00FF0000)>>16;
+       c = (m_address & 0x0000FF00)>>8;
+       d = (m_address & 0x000000FF);
        return itos(a)+"."+itos(b)+"."+itos(c)+"."+itos(d);
 }