From d670395fff93f805b666e0cc4cc56cdb880e0bba Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 25 Jul 2014 22:03:28 +0300 Subject: Use all methods in gamemodifiers as static. --- src/gamemodifiers.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/gamemodifiers.cpp') diff --git a/src/gamemodifiers.cpp b/src/gamemodifiers.cpp index 57a51b0e8..94dea8ecf 100644 --- a/src/gamemodifiers.cpp +++ b/src/gamemodifiers.cpp @@ -76,8 +76,6 @@ &GameModifiers::get##name1##String, 0, true, forward); \ } -GameModifiers *modifiers = nullptr; - GameModifiers::GameModifiers() { settings.crazyMoveType = config.getIntValue("crazyMoveType"); @@ -101,7 +99,7 @@ GameModifiers::~GameModifiers() void GameModifiers::changeMode(unsigned *restrict const var, const unsigned limit, const char *restrict const conf, - std::string (GameModifiers::*const func)(), + std::string (*const func)(), const unsigned def, const bool save, const bool forward) @@ -126,7 +124,7 @@ void GameModifiers::changeMode(unsigned *restrict const var, if (save) config.setValue(conf, *var); UpdateStatusListener::distributeEvent(); - const std::string str = (this->*func)(); + const std::string str = (*func)(); if (str.size() > 4) debugMsg(str.substr(4)); } -- cgit v1.2.3-60-g2f50