[Scummvm-cvs-logs] scummvm master -> 79eb6c898a704f2e41855893643ff3b3aa0bb287

[athrxx]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
79eb6c898a KYRA: (EOB) - fix bug #3596548 ("Crash when using Mage Spells such as Magic Missile")


Commit: 79eb6c898a704f2e41855893643ff3b3aa0bb287
    https://github.com/scummvm/scummvm/commit/79eb6c898a704f2e41855893643ff3b3aa0bb287
Author: athrxx (athrxx at scummvm.org)
Date: 2012-12-17T11:01:24-08:00

Commit Message:
KYRA: (EOB) - fix bug #3596548 ("Crash when using Mage Spells such as Magic Missile")

Changed paths:
    engines/kyra/magic_eob.cpp



diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index fbddd62..b5f2a4e 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -179,7 +179,7 @@ void EoBCoreEngine::castSpell(int spell, int weaponSlot) {
 
 	if ((s->flags & 0x100) && (c->effectFlags & 0x40))
 		// remove invisibility effect
-		removeCharacterEffect(10, _openBookChar, 1);
+		removeCharacterEffect(_flags.gameID == GI_EOB1 ? 8 : 10, _openBookChar, 1);
 
 	int ci = _openBookChar;
 	if (ci > 3)