From 68857593b01b73d33fa1a12011cf9cb402db8a73 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 21 Mar 2016 15:33:52 +0300 Subject: Remove support for stun effects from status-effects.xml --- src/statuseffect.cpp | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'src/statuseffect.cpp') diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp index 97ce131ab..591b70815 100644 --- a/src/statuseffect.cpp +++ b/src/statuseffect.cpp @@ -111,7 +111,6 @@ std::string StatusEffect::getAction() const typedef std::map status_effect_map[2]; static status_effect_map statusEffects; -static status_effect_map stunEffects; static std::map blockEffectIndexMap; int StatusEffect::blockEffectIndexToEffectIndex(const int blockIndex) @@ -138,17 +137,6 @@ StatusEffect *StatusEffect::getStatusEffect(const int index, return nullptr; } -StatusEffect *StatusEffect::getStunEffect(const int index, - const Enable enabling) -{ - std::map &effects - = stunEffects[enabling == Enable_true]; - const std::map::iterator it = effects.find(index); - if (it != effects.end()) - return (*it).second; - return nullptr; -} - void StatusEffect::load() { if (mLoaded) @@ -195,10 +183,6 @@ void StatusEffect::loadXmlFile(const std::string &fileName) if (index >= 0 && block_index >= 0) blockEffectIndexMap[block_index] = index; } - else if (xmlNameEqual(node, "stun-effect")) - { - the_map = &stunEffects; - } if (the_map) { @@ -268,8 +252,6 @@ void StatusEffect::unload() unloadMap(statusEffects[0]); unloadMap(statusEffects[1]); - unloadMap(stunEffects[0]); - unloadMap(stunEffects[1]); mLoaded = false; } -- cgit v1.2.3-60-g2f50