summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-07-29 22:34:23 +0300
committerAndrei Karas <akaras@inbox.ru>2014-07-29 22:34:23 +0300
commit9913b4b481ddcaf0fa8499f3554c85bb588be7f0 (patch)
tree624ce6b5aa9ea89a462a9484bd350aee4675c3aa
parentd425193e392ee14695faa75d7f6d7a7fd3ea4dd2 (diff)
downloadmanaplus-9913b4b481ddcaf0fa8499f3554c85bb588be7f0.tar.gz
manaplus-9913b4b481ddcaf0fa8499f3554c85bb588be7f0.tar.bz2
manaplus-9913b4b481ddcaf0fa8499f3554c85bb588be7f0.tar.xz
manaplus-9913b4b481ddcaf0fa8499f3554c85bb588be7f0.zip
Fix yellow bar settings loading.
-rw-r--r--src/game.cpp1
-rw-r--r--src/gamemodifiers.cpp7
-rw-r--r--src/gamemodifiers.h4
3 files changed, 4 insertions, 8 deletions
diff --git a/src/game.cpp b/src/game.cpp
index c96771e46..7af443a9b 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -155,6 +155,7 @@ static void initEngines()
if (joystick)
joystick->update();
+ GameModifiers::init();
UpdateStatusListener::distributeEvent();
}
diff --git a/src/gamemodifiers.cpp b/src/gamemodifiers.cpp
index 94dea8ecf..228dd66f3 100644
--- a/src/gamemodifiers.cpp
+++ b/src/gamemodifiers.cpp
@@ -76,7 +76,7 @@
&GameModifiers::get##name1##String, 0, true, forward); \
}
-GameModifiers::GameModifiers()
+void GameModifiers::init()
{
settings.crazyMoveType = config.getIntValue("crazyMoveType");
settings.moveToTargetType = config.getIntValue("moveToTargetType");
@@ -90,10 +90,7 @@ GameModifiers::GameModifiers()
settings.imitationMode = config.getIntValue("imitationMode");
settings.disableGameModifiers = config.getBoolValue(
"disableGameModifiers");
-}
-
-GameModifiers::~GameModifiers()
-{
+// UpdateStatusListener::distributeEvent();
}
void GameModifiers::changeMode(unsigned *restrict const var,
diff --git a/src/gamemodifiers.h b/src/gamemodifiers.h
index 497622236..806b4c085 100644
--- a/src/gamemodifiers.h
+++ b/src/gamemodifiers.h
@@ -28,11 +28,9 @@
class GameModifiers final
{
public:
- GameModifiers();
-
A_DELETE_COPY(GameModifiers)
- ~GameModifiers();
+ static void init();
static void changeMode(unsigned *restrict const var,
const unsigned limit,