diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-05-21 01:11:58 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-05-21 01:11:58 +0300 |
| commit | 76e241392d2ad232b751c74df7cba9e5acfa7855 (patch) | |
| tree | e58f72b379c1a4e1b86a4e85c6c0007109635b32 /src/server.h | |
| parent | 73a18b9271bebddfe6716529bb13cad30869bc16 (diff) | |
| parent | 52d857cf1527948e1db5eead457e51b6741de8a2 (diff) | |
| download | minetest-76e241392d2ad232b751c74df7cba9e5acfa7855.tar.gz minetest-76e241392d2ad232b751c74df7cba9e5acfa7855.tar.bz2 minetest-76e241392d2ad232b751c74df7cba9e5acfa7855.zip | |
Merge: New map directory structure and player passwords
Diffstat (limited to 'src/server.h')
| -rw-r--r-- | src/server.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/server.h b/src/server.h index d8b47aef9..289f09618 100644 --- a/src/server.h +++ b/src/server.h @@ -436,6 +436,7 @@ private: */ static void SendHP(con::Connection &con, u16 peer_id, u8 hp); + static void SendAccessDenied(con::Connection &con, u16 peer_id); /* Non-static send methods @@ -476,11 +477,12 @@ private: /* Get a player from memory or creates one. If player is already connected, return NULL + The password is not checked here - it is only used to + set the password if a new player is created. Call with env and con locked. */ - Player *emergePlayer(const char *name, const char *password, - u16 peer_id); + Player *emergePlayer(const char *name, const char *password, u16 peer_id); /* Update water pressure. |