Просмотр исходного кода

Remove suspicios code in display damage calculation

AlexVinS 10 лет назад
Родитель
Сommit
0929e009db
2 измененных файлов с 4 добавлено и 5 удалено
  1. 2 2
      lib/spells/BattleSpellMechanics.h
  2. 2 3
      lib/spells/CDefaultSpellMechanics.cpp

+ 2 - 2
lib/spells/BattleSpellMechanics.h

@@ -21,11 +21,11 @@ public:
 		RESURRECT,
 		TRUE_RESURRECT
 	};
-	
+
 	HealingSpellMechanics(CSpell * s): DefaultSpellMechanics(s){};	
 protected:
 	void applyBattleEffects(const SpellCastEnvironment * env, BattleSpellCastParameters & parameters, SpellCastContext & ctx) const override;
-	
+ 
 	virtual EHealLevel getHealLevel(int effectLevel) const = 0;
 };
 

+ 2 - 3
lib/spells/CDefaultSpellMechanics.cpp

@@ -524,11 +524,10 @@ void DefaultSpellMechanics::applyBattleEffects(const SpellCastEnvironment * env,
 		{
 			int unitSpellPower = parameters.casterStack->valOfBonuses(Bonus::SPECIFIC_SPELL_POWER, owner->id.toEnum());
 			if(unitSpellPower)
-				ctx.sc.dmgToDisplay = spellDamage = parameters.casterStack->count * unitSpellPower; //TODO: handle immunities
+				spellDamage = parameters.casterStack->count * unitSpellPower; //TODO: handle immunities
 			else //Faerie Dragon
 			{
-				parameters.usedSpellPower = parameters.casterStack->valOfBonuses(Bonus::CREATURE_SPELL_POWER) * parameters.casterStack->count / 100;
-				ctx.sc.dmgToDisplay = 0;
+				parameters.usedSpellPower = parameters.casterStack->valOfBonuses(Bonus::CREATURE_SPELL_POWER) * parameters.casterStack->count / 100;				
 			}
 		}
 		int chainLightningModifier = 0;