summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-03-21 17:45:27 +0300
committerAndrei Karas <akaras@inbox.ru>2016-03-21 17:45:27 +0300
commite9b69db0da8303d541f52e7579ce3e90f973ef37 (patch)
tree2f8c56558b9fdc2e312fd170901dcc0b3d749c92
parent49c798d504269545429d1aba72f7ee7a390b002f (diff)
downloadplus-e9b69db0da8303d541f52e7579ce3e90f973ef37.tar.gz
plus-e9b69db0da8303d541f52e7579ce3e90f973ef37.tar.bz2
plus-e9b69db0da8303d541f52e7579ce3e90f973ef37.tar.xz
plus-e9b69db0da8303d541f52e7579ce3e90f973ef37.zip
Simplify status effect db.
-rw-r--r--src/resources/db/statuseffectdb.cpp112
1 files changed, 53 insertions, 59 deletions
diff --git a/src/resources/db/statuseffectdb.cpp b/src/resources/db/statuseffectdb.cpp
index a0e9695ce..d6e5039f2 100644
--- a/src/resources/db/statuseffectdb.cpp
+++ b/src/resources/db/statuseffectdb.cpp
@@ -104,68 +104,62 @@ void StatusEffectDB::loadXmlFile(const std::string &fileName)
loadXmlFile(incName);
continue;
}
-
- IdToEffectMap *the_map = nullptr;
-
- const int index = XML::getProperty(node, "id", -1);
-
- if (xmlNameEqual(node, "status-effect"))
+ else if (!xmlNameEqual(node, "status-effect"))
{
- the_map = &statusEffects;
- const int block_index = atoi(XML::getProperty(
- node, "block-id", "-1").c_str());
-
- if (index >= 0 && block_index >= 0)
- blockIdToIdMap[block_index] = index;
+ continue;
}
- if (the_map)
- {
- StatusEffect *startEffect = (*the_map)[1][index];
- StatusEffect *endEffect = (*the_map)[0][index];
- const std::string name = XML::getProperty(node, "name", "");
- if (!startEffect)
- startEffect = new StatusEffect;
- if (!endEffect)
- endEffect = new StatusEffect;
-
- startEffect->mName = name;
- startEffect->mIsPoison =
- (name == paths.getStringValue("poisonEffectName"));
- startEffect->mIsCart =
- (name == paths.getStringValue("cartEffectName"));
- startEffect->mIsRiding =
- (name == paths.getStringValue("ridingEffectName"));
- startEffect->mIsTrickDead =
- (name == paths.getStringValue("trickDeadEffectName"));
- startEffect->mIsPostDelay =
- (name == paths.getStringValue("postDelayName"));
- startEffect->mMessage = XML::getProperty(
- node, "start-message", "");
- startEffect->mSFXEffect = XML::getProperty(
- node, "start-audio", "");
- startEffect->mParticleEffect = XML::getProperty(
- node, "start-particle", "");
-
- startEffect->mIcon = XML::getProperty(node, "icon", "");
- startEffect->mAction = XML::getProperty(node, "action", "");
- startEffect->mIsPersistent = (XML::getProperty(
- node, "persistent-particle-effect", "no")) != "no";
-
- endEffect->mName = startEffect->mName;
- endEffect->mIsPoison = startEffect->mIsPoison;
- endEffect->mIsCart = startEffect->mIsCart;
- endEffect->mIsRiding = startEffect->mIsRiding;
- endEffect->mIsTrickDead = startEffect->mIsTrickDead;
- endEffect->mIsPostDelay = startEffect->mIsPostDelay;
- endEffect->mMessage = XML::getProperty(node, "end-message", "");
- endEffect->mSFXEffect = XML::getProperty(node, "end-audio", "");
- endEffect->mParticleEffect = XML::getProperty(
- node, "end-particle", "");
-
- (*the_map)[1][index] = startEffect;
- (*the_map)[0][index] = endEffect;
- }
+ const int index = XML::getProperty(node, "id", -1);
+ const int block_index = atoi(XML::getProperty(
+ node, "block-id", "-1").c_str());
+
+ if (index >= 0 && block_index >= 0)
+ blockIdToIdMap[block_index] = index;
+
+ StatusEffect *startEffect = statusEffects[1][index];
+ StatusEffect *endEffect = statusEffects[0][index];
+ const std::string name = XML::getProperty(node, "name", "");
+ if (!startEffect)
+ startEffect = new StatusEffect;
+ if (!endEffect)
+ endEffect = new StatusEffect;
+
+ startEffect->mName = name;
+ startEffect->mIsPoison =
+ (name == paths.getStringValue("poisonEffectName"));
+ startEffect->mIsCart =
+ (name == paths.getStringValue("cartEffectName"));
+ startEffect->mIsRiding =
+ (name == paths.getStringValue("ridingEffectName"));
+ startEffect->mIsTrickDead =
+ (name == paths.getStringValue("trickDeadEffectName"));
+ startEffect->mIsPostDelay =
+ (name == paths.getStringValue("postDelayName"));
+ startEffect->mMessage = XML::getProperty(
+ node, "start-message", "");
+ startEffect->mSFXEffect = XML::getProperty(
+ node, "start-audio", "");
+ startEffect->mParticleEffect = XML::getProperty(
+ node, "start-particle", "");
+
+ startEffect->mIcon = XML::getProperty(node, "icon", "");
+ startEffect->mAction = XML::getProperty(node, "action", "");
+ startEffect->mIsPersistent = (XML::getProperty(
+ node, "persistent-particle-effect", "no")) != "no";
+
+ endEffect->mName = startEffect->mName;
+ endEffect->mIsPoison = startEffect->mIsPoison;
+ endEffect->mIsCart = startEffect->mIsCart;
+ endEffect->mIsRiding = startEffect->mIsRiding;
+ endEffect->mIsTrickDead = startEffect->mIsTrickDead;
+ endEffect->mIsPostDelay = startEffect->mIsPostDelay;
+ endEffect->mMessage = XML::getProperty(node, "end-message", "");
+ endEffect->mSFXEffect = XML::getProperty(node, "end-audio", "");
+ endEffect->mParticleEffect = XML::getProperty(
+ node, "end-particle", "");
+
+ statusEffects[1][index] = startEffect;
+ statusEffects[0][index] = endEffect;
}
}