diff options
author | Elias Fleckenstein <eliasfleckenstein@web.de> | 2020-10-18 12:54:08 +0200 |
---|---|---|
committer | Elias Fleckenstein <eliasfleckenstein@web.de> | 2020-10-18 12:54:08 +0200 |
commit | 3a718f12b433ef3980c8fc6e29957595110cd8f4 (patch) | |
tree | f7c05e501df2c9a40d62ba13b0a3b9b78b394959 /src/script/cpp_api/s_cheats.cpp | |
parent | 3b596a96e07bf8f799be6c21a546355980e34b94 (diff) | |
download | dragonfireclient-3a718f12b433ef3980c8fc6e29957595110cd8f4.tar.xz |
Make lint happy; Remove stupid redirector
Diffstat (limited to 'src/script/cpp_api/s_cheats.cpp')
-rw-r--r-- | src/script/cpp_api/s_cheats.cpp | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/src/script/cpp_api/s_cheats.cpp b/src/script/cpp_api/s_cheats.cpp index 8f3e4ef14..4ad62f2fe 100644 --- a/src/script/cpp_api/s_cheats.cpp +++ b/src/script/cpp_api/s_cheats.cpp @@ -15,44 +15,42 @@ GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ +*/ #include "cpp_api/s_cheats.h" #include "cpp_api/s_base.h" #include "cpp_api/s_internal.h" #include "settings.h" -ScriptApiCheatsCheat::ScriptApiCheatsCheat(const std::string &name, const std::string &setting) : - m_name(name), - m_setting(setting), - m_function_ref(0) +ScriptApiCheatsCheat::ScriptApiCheatsCheat( + const std::string &name, const std::string &setting) : + m_name(name), + m_setting(setting), m_function_ref(0) { } ScriptApiCheatsCheat::ScriptApiCheatsCheat(const std::string &name, const int &function) : - m_name(name), - m_setting(""), - m_function_ref(function) + m_name(name), m_setting(""), m_function_ref(function) { } bool ScriptApiCheatsCheat::is_enabled() { try { - return ! m_function_ref && g_settings->getBool(m_setting); + return !m_function_ref && g_settings->getBool(m_setting); } catch (SettingNotFoundException &) { return false; } } void ScriptApiCheatsCheat::toggle(lua_State *L, int error_handler) -{ +{ if (m_function_ref) { lua_rawgeti(L, LUA_REGISTRYINDEX, m_function_ref); lua_pcall(L, 0, 0, error_handler); } else - g_settings->setBool(m_setting, ! is_enabled()); + g_settings->setBool(m_setting, !is_enabled()); } ScriptApiCheatsCategory::ScriptApiCheatsCategory(const std::string &name) : @@ -75,7 +73,8 @@ void ScriptApiCheatsCategory::read_cheats(lua_State *L) if (lua_isstring(L, -1)) cheat = new ScriptApiCheatsCheat(name, lua_tostring(L, -1)); else if (lua_isfunction(L, -1)) { - cheat = new ScriptApiCheatsCheat(name, luaL_ref(L, LUA_REGISTRYINDEX)); + cheat = new ScriptApiCheatsCheat( + name, luaL_ref(L, LUA_REGISTRYINDEX)); lua_pushnil(L); } if (cheat) @@ -93,10 +92,10 @@ ScriptApiCheats::~ScriptApiCheats() void ScriptApiCheats::init_cheats() { SCRIPTAPI_PRECHECKHEADER - + lua_getglobal(L, "core"); lua_getfield(L, -1, "cheats"); - if (! lua_istable(L, -1)) { + if (!lua_istable(L, -1)) { lua_pop(L, 2); return; } @@ -116,10 +115,10 @@ void ScriptApiCheats::init_cheats() void ScriptApiCheats::toggle_cheat(ScriptApiCheatsCheat *cheat) { SCRIPTAPI_PRECHECKHEADER - + PUSH_ERROR_HANDLER(L); int error_handler = lua_gettop(L) - 1; lua_insert(L, error_handler); - + cheat->toggle(L, error_handler); } |