summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-16 20:35:32 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-16 20:35:32 +0300
commit2ff3df08fa993d1bf1f00f47f7cbad7b60ce3ce3 (patch)
tree18f29487d5596859679302c4cd7cc764e20708a4 /src/resources
parente1e32075c34dc61f6abbd7b9cd1aed250854d6de (diff)
downloadmanaplus-2ff3df08fa993d1bf1f00f47f7cbad7b60ce3ce3.tar.gz
manaplus-2ff3df08fa993d1bf1f00f47f7cbad7b60ce3ce3.tar.bz2
manaplus-2ff3df08fa993d1bf1f00f47f7cbad7b60ce3ce3.tar.xz
manaplus-2ff3df08fa993d1bf1f00f47f7cbad7b60ce3ce3.zip
In features.xml add option for fix dead animations.
New option: fixDeadAnimation Default value: true
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/spritedef.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index 74ac376b5..7b89af145 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -22,7 +22,9 @@
#include "resources/spritedef.h"
+#include "configuration.h"
#include "logger.h"
+#include "settings.h"
#include "resources/map/mapconsts.h"
@@ -34,8 +36,6 @@
#include "resources/spriteaction.h"
#include "resources/spritereference.h"
-#include "configuration.h"
-
#include "debug.h"
SpriteReference *SpriteReference::Empty = nullptr;
@@ -106,7 +106,7 @@ SpriteDef *SpriteDef::load(const std::string &animationFile,
def->mProcessedFiles.insert(animationFile);
def->loadSprite(rootNode, variant, palettes);
def->substituteActions();
- if (serverVersion < 1)
+ if (settings.fixDeadAnimation)
def->fixDeadAction();
if (prot)
{