diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-06-27 06:56:26 -0700 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-06-27 06:56:26 -0700 |
| commit | f37a3a84fafb91bcfc109fed95aa6d42726f1bf7 (patch) | |
| tree | cde1e5f47f191beb4a9cefcd87872aef53b5fcec /src/client.h | |
| parent | e261cc9e8fa67c9020fa0a82bd1a7041ecd351a0 (diff) | |
| parent | 13cf5425db613dc0a4323c87a4988bb18fb87aca (diff) | |
| download | minetest-f37a3a84fafb91bcfc109fed95aa6d42726f1bf7.tar.gz minetest-f37a3a84fafb91bcfc109fed95aa6d42726f1bf7.tar.bz2 minetest-f37a3a84fafb91bcfc109fed95aa6d42726f1bf7.zip | |
Merge pull request #13 from Bahamada/upstream_merge
Upstream merge
Diffstat (limited to 'src/client.h')
| -rw-r--r-- | src/client.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/client.h b/src/client.h index f661838ce..a1b1c66b4 100644 --- a/src/client.h +++ b/src/client.h @@ -385,6 +385,11 @@ public: return m_access_denied; } + inline std::wstring accessDeniedReason() + { + return m_access_denied_reason; + } + private: // Virtual methods from con::PeerHandler @@ -440,10 +445,13 @@ private: std::string m_password; bool m_access_denied; + std::wstring m_access_denied_reason; InventoryContext m_inventory_context; Queue<ClientEvent> m_client_event_queue; + + friend class FarMesh; }; #endif // !SERVER |