found out the difference between spell disruption checks and concentr…

…ation renamed the disruption function and fixed the comments accordingly fixing concentration remains a TODO
gemrb · May 8, 2014 · 3b5706b · 3b5706b
1 parent 6c1967b
commit 3b5706b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/gemrb/core/Scriptable/Actor.cpp b/gemrb/core/Scriptable/Actor.cpp
@@ -3739,13 +3739,16 @@ void Actor::GetHit(int damage, int spellLevel)
 		Effect *fx = EffectQueue::CreateEffect(fx_cure_sleep_ref, 0, 0, FX_DURATION_INSTANT_PERMANENT);
 		fxqueue.AddEffect(fx);
 	}
-	if (CheckCastingInterrupt(damage, spellLevel)) {
+	if (CheckSpellDisruption(damage, spellLevel)) {
 		InterruptCasting = true;
 	}
 }
 
-// TODO: check that this isn't the same thing we have in GSUtils (that one is missing a debug string in the original)
+// this has no effect in adnd
-bool Actor::CheckCastingInterrupt(int damage, int spellLevel)
+// iwd2 however has two mechanisms: spell disruption and concentration checks:
+// - disruption is checked when a caster is damaged while casting
+// - concentration is checked when casting is taking place <= 5' from an enemy
+bool Actor::CheckSpellDisruption(int damage, int spellLevel)
 {
 	if (!third) {
 		return true;

diff --git a/gemrb/core/Scriptable/Actor.h b/gemrb/core/Scriptable/Actor.h
@@ -549,8 +549,8 @@ class GEM_EXPORT Actor : public Movable {
 	void DialogInterrupt();
 	/* called when actor was hit */
 	void GetHit(int damage=0, int spellLevel=0);
-	/* checks whether concentration cancels damage taken disrupting casting */
+	/* checks whether taking damage should disrupt spellcasting */
-	bool CheckCastingInterrupt(int damage, int spellLevel);
+	bool CheckSpellDisruption(int damage, int spellLevel);
 	/* called when actor starts to cast a spell*/
 	bool HandleCastingStance(const ieResRef SpellResRef, bool deplete, bool instant);
 	/* check if the actor should be just knocked out by a lethal hit */