summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/beinginfo.cpp11
-rw-r--r--src/resources/beinginfo.h2
-rw-r--r--src/resources/monsterdb.cpp2
3 files changed, 14 insertions, 1 deletions
diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp
index 9ee0f3de9..eef4ba7b7 100644
--- a/src/resources/beinginfo.cpp
+++ b/src/resources/beinginfo.cpp
@@ -22,6 +22,7 @@
#include "resources/beinginfo.h"
+#include "configuration.h"
#include "logger.h"
#include "utils/dtor.h"
@@ -132,3 +133,13 @@ void BeingInfo::clear()
delete empty;
empty = nullptr;
}
+
+void BeingInfo::init()
+{
+ if (empty)
+ {
+ empty->mEffectId = paths.getIntValue("effectId");
+ empty->mHitEffectId = paths.getIntValue("hitEffectId");
+ empty->mCriticalHitEffectId = paths.getIntValue("criticalHitEffectId");
+ }
+}
diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h
index 306ac637d..d08e85608 100644
--- a/src/resources/beinginfo.h
+++ b/src/resources/beinginfo.h
@@ -169,6 +169,8 @@ class BeingInfo final
void setDeadSortOffsetY(const int n)
{ mDeadSortOffsetY = n; }
+ static void init();
+
static void clear();
private:
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index d6aa53809..2bbd51d5a 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -191,7 +191,7 @@ void MonsterDB::load()
{
const int id = XML::getProperty(spriteNode, "id", 0);
const int effectId = XML::getProperty(
- spriteNode, "effect-id", -1);
+ spriteNode, "effect-id", paths.getIntValue("effectId"));
int hitEffectId = XML::getProperty(spriteNode,
"hit-effect-id", paths.getIntValue("hitEffectId"));
int criticalHitEffectId = XML::getProperty(spriteNode,