From 0b97ad838466ed44296a2c663b2dc034feb51f67 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Sat, 12 Nov 2011 15:41:29 +0200 Subject: ServerRemotePlayer implements ServerActiveObject --- src/player.cpp | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) (limited to 'src/player.cpp') diff --git a/src/player.cpp b/src/player.cpp index 732911828..396ce2494 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -144,16 +144,12 @@ void Player::deSerialize(std::istream &is) args.parseConfigLine(line); } - //args.getS32("version"); + //args.getS32("version"); // Version field value not used 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"); + setPitch(args.getFloat("pitch")); + setYaw(args.getFloat("yaw")); + setPosition(args.getV3F("position")); try{ craftresult_is_preview = args.getBool("craftresult_is_preview"); }catch(SettingNotFoundException &e){ @@ -164,20 +160,6 @@ void Player::deSerialize(std::istream &is) }catch(SettingNotFoundException &e){ hp = 20; } - /*try{ - std::string sprivs = args.get("privs"); - if(sprivs == "all") - { - privs = PRIV_ALL; - } - else - { - std::istringstream ss(sprivs); - ss>>privs; - } - }catch(SettingNotFoundException &e){ - privs = PRIV_DEFAULT; - }*/ inventory.deSerialize(is); } -- cgit v1.2.3