From f2a88e6a37a4db54567e5062fdabeb6d04ca0790 Mon Sep 17 00:00:00 2001
From: Koncord <stas5978@gmail.com>
Date: Fri, 16 Feb 2018 04:58:37 +0800
Subject: [PATCH] [Server] Use multiple parameters instead functions for Mark
 functions

---
 apps/openmw-mp/Player.cpp | 42 ++++++++++-----------------------------
 apps/openmw-mp/Player.hpp |  8 ++------
 2 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/apps/openmw-mp/Player.cpp b/apps/openmw-mp/Player.cpp
index 00f1124e9..6bd6cd815 100644
--- a/apps/openmw-mp/Player.cpp
+++ b/apps/openmw-mp/Player.cpp
@@ -91,12 +91,9 @@ void Player::Init(LuaState &lua)
                                          "getQuickKeys", &Player::getQuickKeys,
                                          "getWeatherMgr", &Player::getWeatherMgr,
 
-                                         "getMarkPosition", &Player::getMarkPosition,
-                                         "setMarkPosition", &Player::setMarkPosition,
-                                         "getMarkRotation", &Player::getMarkRotation,
-                                         "setMarkRotation", &Player::setMarkRotation,
-                                         "getMarkCell", &Player::getMarkCell,
-                                         "setMarkCell", &Player::setMarkCell,
+                                         "getMark", &Player::getMark,
+                                         "setMark", &Player::setMark,
+
                                          "getSelectedSpell", &Player::getSelectedSpell,
                                          "setSelectedSpell", &Player::setSelectedSpell,
 
@@ -871,42 +868,23 @@ void Player::setScale(float newScale)
     packet->Send(true);
 }
 
-std::tuple<float, float, float> Player::getMarkPosition()
-{
-    return make_tuple(markPosition.pos[0], markPosition.pos[1], markPosition.pos[2]);
-}
-
-void Player::setMarkPosition(float x, float y, float z)
+void Player::setMark(float x, float y, float z, float xRot, float zRot, const std::string &cellDescription)
 {
     markPosition.pos[0] = x;
     markPosition.pos[1] = y;
     markPosition.pos[2] = z;
 
-    changedMarkLocation = true;
-}
-
-std::tuple<float, float> Player::getMarkRotation()
-{
-    return make_tuple(markPosition.rot[0], markPosition.rot[2]);
-}
-
-void Player::setMarkRotation(float x, float z)
-{
-    markPosition.rot[0] = x;
-    markPosition.rot[2] = z;
+    markPosition.rot[0] = xRot;
+    markPosition.rot[2] = zRot;
+    markCell = Utils::getCellFromDescription(cellDescription);
 
     changedMarkLocation = true;
 }
 
-std::string Player::getMarkCell()
-{
-    return markCell.getDescription();
-}
-
-void Player::setMarkCell(const std::string &cellDescription)
+std::tuple<float, float, float, float, float, std::string> Player::getMark()
 {
-    markCell = Utils::getCellFromDescription(cellDescription);
-    changedMarkLocation = true;
+    return make_tuple(markPosition.pos[0], markPosition.pos[1], markPosition.pos[2],
+                      markPosition.rot[0], markPosition.rot[2], markCell.getDescription());
 }
 
 std::string Player::getSelectedSpell()
diff --git a/apps/openmw-mp/Player.hpp b/apps/openmw-mp/Player.hpp
index f8168d89b..040aafc90 100644
--- a/apps/openmw-mp/Player.hpp
+++ b/apps/openmw-mp/Player.hpp
@@ -178,12 +178,8 @@ public:
     int getSkillIncrease(unsigned short attributeId) const;
     void setSkillIncrease(unsigned short attributeId, int increase);
 
-    std::tuple<float, float, float> getMarkPosition();
-    void setMarkPosition(float x, float y, float z);
-    std::tuple<float, float> getMarkRotation();
-    void setMarkRotation(float x, float z);
-    std::string getMarkCell();
-    void setMarkCell(const std::string &cellDescription);
+    void setMark(float x, float y, float z, float xRot, float zRot, const std::string &cellDescription);
+    std::tuple<float, float, float, float, float, std::string> getMark();
 
     std::string getSelectedSpell();
     void setSelectedSpell(const std::string &newSelectedSpellId);