From d33254f2875bb3e7295b5433b7f8f46d14870f11 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Sun, 19 Nov 2017 12:35:11 +0200 Subject: [PATCH] [Server] Rename CharClass' isDefault() into isCustom() It was already using the logic of isCustom() by mistake. --- apps/openmw-mp/CharClass.cpp | 4 ++-- apps/openmw-mp/CharClass.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/openmw-mp/CharClass.cpp b/apps/openmw-mp/CharClass.cpp index e3f2f4fef..12d3c0345 100644 --- a/apps/openmw-mp/CharClass.cpp +++ b/apps/openmw-mp/CharClass.cpp @@ -16,7 +16,7 @@ void CharClass::Init(LuaState &lua) lua.getState()->new_usertype("Class", //"__gc", sol::destructor(deleter), "default", sol::property(&CharClass::getDefault, &CharClass::setDefault), - "isDefault", &CharClass::isDefault, + "isCustom", &CharClass::isCustom, "name", sol::property(&CharClass::getName, &CharClass::setName), "description", sol::property(&CharClass::getDescription, &CharClass::setDescription), @@ -56,7 +56,7 @@ void CharClass::setDefault(const string &className) printf("CharClass::setDefault()\n"); } -bool CharClass::isDefault() const +bool CharClass::isCustom() const { return player->charClass.mId.empty(); } diff --git a/apps/openmw-mp/CharClass.hpp b/apps/openmw-mp/CharClass.hpp index c2e0ab357..eed7af065 100644 --- a/apps/openmw-mp/CharClass.hpp +++ b/apps/openmw-mp/CharClass.hpp @@ -22,7 +22,7 @@ public: std::string getDefault() const; void setDefault(const std::string &className); - bool isDefault() const; + bool isCustom() const; std::string getName() const; void setName(const std::string &className);