diff --git a/apps/openmw-mp/Cells.cpp b/apps/openmw-mp/Cells.cpp index fc8866e68..c517b0e0d 100644 --- a/apps/openmw-mp/Cells.cpp +++ b/apps/openmw-mp/Cells.cpp @@ -14,7 +14,7 @@ using namespace std; void Cells::Init(LuaState &lua) { lua.getState()->new_usertype("Cell", - "description", sol::property(&Cells::getCell, &Cells::setCell), + "description", sol::property(&Cells::getDescription, &Cells::setDescription), "getExterior", &Cells::getExterior, "setExterior", &Cells::setExterior, "getRegion", &Cells::getRegion, @@ -39,12 +39,12 @@ void Cells::update() } -std::string Cells::getCell() const +std::string Cells::getDescription() const { return netActor->getNetCreature()->cell.getDescription(); } -void Cells::setCell(const std::string &cellDescription) +void Cells::setDescription(const std::string &cellDescription) { /*LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Script is moving %s from %s to %s", netActor->getNetCreature()->npc.mName.c_str(), netActor->getNetCreature()->cell.getDescription().c_str(), cellDescription.c_str());*/ diff --git a/apps/openmw-mp/Cells.hpp b/apps/openmw-mp/Cells.hpp index 72dd6c305..97fa167fa 100644 --- a/apps/openmw-mp/Cells.hpp +++ b/apps/openmw-mp/Cells.hpp @@ -21,8 +21,8 @@ public: void update(); - std::string getCell() const; - void setCell(const std::string &cellDescription); + std::string getDescription() const; + void setDescription(const std::string &cellDescription); std::tuple getExterior() const; void setExterior(int x, int y); diff --git a/apps/openmw-mp/CharClass.cpp b/apps/openmw-mp/CharClass.cpp index c6a3d4980..e3f2f4fef 100644 --- a/apps/openmw-mp/CharClass.cpp +++ b/apps/openmw-mp/CharClass.cpp @@ -19,7 +19,7 @@ void CharClass::Init(LuaState &lua) "isDefault", &CharClass::isDefault, "name", sol::property(&CharClass::getName, &CharClass::setName), - "description", sol::property(&CharClass::getDesc, &CharClass::setDesc), + "description", sol::property(&CharClass::getDescription, &CharClass::setDescription), "specialization", sol::property(&CharClass::getSpecialization, &CharClass::setSpecialization), @@ -72,12 +72,12 @@ string CharClass::getName() const return player->charClass.mName; } -std::string CharClass::getDesc() const +std::string CharClass::getDescription() const { return player->charClass.mDescription; } -void CharClass::setDesc(const string &desc) +void CharClass::setDescription(const string &desc) { player->charClass.mDescription = desc; changed = true; @@ -115,10 +115,10 @@ std::tuple CharClass::getMinorSkills() const return make_tuple( data.mSkills[0][0], data.mSkills[1][0], data.mSkills[2][0], data.mSkills[3][0], data.mSkills[4][0]); } -void CharClass::setMinorSkills(int fisrt, int second, int third, int fourth, int fifth) +void CharClass::setMinorSkills(int first, int second, int third, int fourth, int fifth) { auto &data = player->charClass.mData; - data.mSkills[0][0] = fisrt; + data.mSkills[0][0] = first; data.mSkills[1][0] = second; data.mSkills[2][0] = third; data.mSkills[3][0] = fourth; @@ -132,10 +132,10 @@ std::tuple CharClass::getMajorSkills() const return make_tuple( data.mSkills[0][1], data.mSkills[1][1], data.mSkills[2][1], data.mSkills[3][1], data.mSkills[4][1]); } -void CharClass::setMajorSkills(int fisrt, int second, int third, int fourth, int fifth) +void CharClass::setMajorSkills(int first, int second, int third, int fourth, int fifth) { auto &data = player->charClass.mData; - data.mSkills[0][1] = fisrt; + data.mSkills[0][1] = first; data.mSkills[1][1] = second; data.mSkills[2][1] = third; data.mSkills[3][1] = fourth; diff --git a/apps/openmw-mp/CharClass.hpp b/apps/openmw-mp/CharClass.hpp index 5905a9631..c2e0ab357 100644 --- a/apps/openmw-mp/CharClass.hpp +++ b/apps/openmw-mp/CharClass.hpp @@ -27,8 +27,8 @@ public: std::string getName() const; void setName(const std::string &className); - std::string getDesc() const; - void setDesc(const std::string &desc); + std::string getDescription() const; + void setDescription(const std::string &desc); std::tuple getMajorAttributes() const; void setMajorAttributes(int first, int second);