diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-07-25 22:03:28 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-07-25 22:03:28 +0300 |
commit | d670395fff93f805b666e0cc4cc56cdb880e0bba (patch) | |
tree | e7949649a7c0568b3b238c91092f60606a495f9f /src/gamemodifiers.cpp | |
parent | 7d6d3d997614e8e76ca9044ca8ed5a81d3b14a95 (diff) | |
download | manaplus-d670395fff93f805b666e0cc4cc56cdb880e0bba.tar.gz manaplus-d670395fff93f805b666e0cc4cc56cdb880e0bba.tar.bz2 manaplus-d670395fff93f805b666e0cc4cc56cdb880e0bba.tar.xz manaplus-d670395fff93f805b666e0cc4cc56cdb880e0bba.zip |
Use all methods in gamemodifiers as static.
Diffstat (limited to 'src/gamemodifiers.cpp')
-rw-r--r-- | src/gamemodifiers.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
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)); } |