krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

[Server] Use multiple parameters instead functions for Mark functions

Browse source
This commit is contained in:
Koncord 2018-02-16 04:58:37 +08:00
parent 410eb353e8
commit f2a88e6a37
2 changed files with 15 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
apps/openmw-mp/Player.cpp
View file

@ -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,44 +868,25 @@ 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;
changedMarkLocation = true;
}
std::string Player::getMarkCell()
{
return markCell.getDescription();
}
void Player::setMarkCell(const std::string &cellDescription)
{
markPosition.rot[0] = xRot;
markPosition.rot[2] = zRot;
markCell = Utils::getCellFromDescription(cellDescription);
changedMarkLocation = true;
}
std::tuple<float, float, float, float, float, std::string> Player::getMark()
{
return make_tuple(markPosition.pos[0], markPosition.pos[1], markPosition.pos[2],
markPosition.rot[0], markPosition.rot[2], markCell.getDescription());
}
std::string Player::getSelectedSpell()
{
return selectedSpellId;

8
apps/openmw-mp/Player.hpp
View file

@ -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);