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

[Server] Replace Player's isMale() and setIsMale() with gender property

Browse source 
For simplicity and clarity.
This commit is contained in:
David Cernat 2017-11-19 11:06:35 +02:00
parent 6f822f54aa
commit 947b3f76be
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,9 +45,8 @@ void Player::Init(LuaState &lua)
"name", sol::property(&Player::getName, &Player::setName), "name", sol::property(&Player::getName, &Player::setName),
"setCharGenStages", &Player::setCharGenStages, "setCharGenStages", &Player::setCharGenStages,
"isMale", &Player::isMale,
"setIsMale", &Player::setIsMale,
"level", sol::property(&Player::getLevel, &Player::setLevel), "level", sol::property(&Player::getLevel, &Player::setLevel),
"gender", sol::property(&Player::getGender, &Player::setGender),
"race", sol::property(&Player::getRace, &Player::setRace), "race", sol::property(&Player::getRace, &Player::setRace),
"head", sol::property(&Player::getHead, &Player::setHead), "head", sol::property(&Player::getHead, &Player::setHead),
"hair", sol::property(&Player::getHair, &Player::setHair), "hair", sol::property(&Player::getHair, &Player::setHair),
@ -353,17 +352,6 @@ void Player::message(const std::string &message, bool toAll)
packet->Send(true); packet->Send(true);
} }
bool Player::isMale() const
{
return npc.isMale();
}
void Player::setIsMale(bool male)
{
npc.setIsMale(male);
baseInfoChanged = true;
}
void Player::setLevel(int level) void Player::setLevel(int level)
{ {
creatureStats.mLevel = level; creatureStats.mLevel = level;
@ -375,6 +363,17 @@ int Player::getLevel() const
return creatureStats.mLevel; return creatureStats.mLevel;
} }
void Player::setGender(int gender)
{
npc.setIsMale(gender);
baseInfoChanged = true;
}
int Player::getGender() const
{
return npc.isMale();
}
void Player::setRace(const std::string &race) void Player::setRace(const std::string &race)
{ {
LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Setting race for %s: %s -> %s", npc.mName.c_str(), npc.mRace.c_str(), race.c_str()); LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Setting race for %s: %s -> %s", npc.mName.c_str(), npc.mRace.c_str(), race.c_str());

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

@ -82,8 +82,8 @@ public:
std::string getName(); std::string getName();
void setCharGenStages(int currentStage, int endStage); void setCharGenStages(int currentStage, int endStage);
void message(const std::string &message, bool toAll = false); void message(const std::string &message, bool toAll = false);
bool isMale() const; void setGender(int gender);
void setIsMale(bool male); int getGender() const;
void setRace(const std::string &race); void setRace(const std::string &race);
std::string getRace() const; std::string getRace() const;
void setHead(const std::string &head); void setHead(const std::string &head);