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/player.cpp | |
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/player.cpp')
-rw-r--r-- | src/player.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/player.cpp b/src/player.cpp index 3f92e899c..539244709 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -87,6 +87,7 @@ Player::Player(): m_position(0,0,0) { updateName("<not set>"); + updatePassword(""); resetInventory(); } @@ -145,6 +146,7 @@ void Player::serialize(std::ostream &os) Settings args; args.setS32("version", 1); args.set("name", m_name); + args.set("password", m_password); args.setFloat("pitch", m_pitch); args.setFloat("yaw", m_yaw); args.setV3F("position", m_position); @@ -179,6 +181,10 @@ void Player::deSerialize(std::istream &is) //args.getS32("version"); std::string name = args.get("name"); updateName(name.c_str()); + std::string password = ""; + if(args.exists("password")) + password = args.get("password"); + updatePassword(password.c_str()); m_pitch = args.getFloat("pitch"); m_yaw = args.getFloat("yaw"); m_position = args.getV3F("position"); |