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 | 1c90f9fc2eba43be71f9d49dad75c5d0514d4e50 (patch) | |
| tree | 63c1116ff43936475874b54d171c7e08556d54ee /src/client.h | |
| parent | 158b054e72582005d895f1ed0e1cb0c9b22a8e57 (diff) | |
| parent | 7efe89ff584b2c0338dcede4c1e08504d0158780 (diff) | |
| download | minetest-1c90f9fc2eba43be71f9d49dad75c5d0514d4e50.tar.gz minetest-1c90f9fc2eba43be71f9d49dad75c5d0514d4e50.tar.bz2 minetest-1c90f9fc2eba43be71f9d49dad75c5d0514d4e50.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 |