diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-02-23 01:35:50 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-02-23 01:35:50 +0300 |
commit | 2f4c37b969c0aeeb35c38dddb0b5f62ea86233bd (patch) | |
tree | 275915ca8dd3fc5809f08239153430cb5c5ffa71 | |
parent | c842a29a63ff5bd7a09aa1c2dfbc96c4a94d4243 (diff) | |
download | manaplus-2f4c37b969c0aeeb35c38dddb0b5f62ea86233bd.tar.gz manaplus-2f4c37b969c0aeeb35c38dddb0b5f62ea86233bd.tar.bz2 manaplus-2f4c37b969c0aeeb35c38dddb0b5f62ea86233bd.tar.xz manaplus-2f4c37b969c0aeeb35c38dddb0b5f62ea86233bd.zip |
Improve effectmanager class.
-rw-r--r-- | src/effectmanager.cpp | 9 | ||||
-rw-r--r-- | src/effectmanager.h | 13 |
2 files changed, 14 insertions, 8 deletions
diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp index be7fa1e83..5901e21ea 100644 --- a/src/effectmanager.cpp +++ b/src/effectmanager.cpp @@ -48,11 +48,10 @@ EffectManager::EffectManager() { if (xmlNameEqual(node, "effect")) { - EffectDescription ed; - ed.id = XML::getProperty(node, "id", -1); - ed.GFX = XML::getProperty(node, "particle", ""); - ed.SFX = XML::getProperty(node, "audio", ""); - mEffects.push_back(ed); + mEffects.push_back(EffectDescription( + XML::getProperty(node, "id", -1), + XML::getProperty(node, "particle", ""), + XML::getProperty(node, "audio", ""))); } } } diff --git a/src/effectmanager.h b/src/effectmanager.h index b5d8e5bfc..d8bbd691b 100644 --- a/src/effectmanager.h +++ b/src/effectmanager.h @@ -37,9 +37,16 @@ class EffectManager final public: struct EffectDescription { - int id; - std::string GFX; - std::string SFX; + EffectDescription(int id0, const std::string GFX0, + const std::string SFX0) : + id(id0), + GFX(GFX0), + SFX(SFX0) + { + } + int id; + std::string GFX; + std::string SFX; }; EffectManager(); |