Use Irrlicht functions to query npot texture support

[dragonfireclient.git] / src / clientiface.h

diff --git a/src/clientiface.h b/src/clientiface.h
index eabffb0b6f1f47813595de96d4143848c46f4d99..cc5292b71bf96fb5b2c8d9063921fc8ff18c7f15 100644 (file)
--- a/src/clientiface.h
+++ b/src/clientiface.h
@@ -25,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "serialization.h"             // for SER_FMT_VER_INVALID
 #include "network/networkpacket.h"
 #include "network/networkprotocol.h"
+#include "network/address.h"
 #include "porting.h"
 
 #include <list>
@@ -188,7 +189,6 @@ enum ClientStateEvent
 {
        CSE_Hello,
        CSE_AuthAccept,
-       CSE_InitLegacy,
        CSE_GotInit2,
        CSE_SetDenied,
        CSE_SetDefinitionsSent,
@@ -338,17 +338,24 @@ class RemoteClient
        u8 getMajor() const { return m_version_major; }
        u8 getMinor() const { return m_version_minor; }
        u8 getPatch() const { return m_version_patch; }
-       const std::string &getFull() const { return m_full_version; }
+       const std::string &getFullVer() const { return m_full_version; }
        
        void setLangCode(const std::string &code) { m_lang_code = code; }
        const std::string &getLangCode() const { return m_lang_code; }
+
+       void setCachedAddress(const Address &addr) { m_addr = addr; }
+       const Address &getAddress() const { return m_addr; }
+
 private:
        // Version is stored in here after INIT before INIT2
        u8 m_pending_serialization_version = SER_FMT_VER_INVALID;
 
        /* current state of client */
        ClientState m_state = CS_Created;
-       
+
+       // Cached here so retrieval doesn't have to go to connection API
+       Address m_addr;
+
        // Client sent language code
        std::string m_lang_code;
 
@@ -412,7 +419,7 @@ class RemoteClient
 
        /*
                client information
-        */
+       */
        u8 m_version_major = 0;
        u8 m_version_minor = 0;
        u8 m_version_patch = 0;