[Scummvm-git-logs] scummvm master -> ab25cfd0dfc861744c8790af2529a3ebe734b4df

[dreammaster]

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:
ab25cfd0df MM: MM1: Fix crash using Turn Undead spell


Commit: ab25cfd0dfc861744c8790af2529a3ebe734b4df
    https://github.com/scummvm/scummvm/commit/ab25cfd0dfc861744c8790af2529a3ebe734b4df
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-08-06T14:44:32-07:00

Commit Message:
MM: MM1: Fix crash using Turn Undead spell

Changed paths:
    engines/mm/mm1/views/combat.cpp


diff --git a/engines/mm/mm1/views/combat.cpp b/engines/mm/mm1/views/combat.cpp
index 94a88655ab1..08dc6a53b67 100644
--- a/engines/mm/mm1/views/combat.cpp
+++ b/engines/mm/mm1/views/combat.cpp
@@ -841,8 +841,13 @@ void Combat::setOption(SelectedOption option) {
 }
 
 void Combat::displaySpellResult(const InfoMessage &msg) {
-	assert(msg._delaySeconds);
-	_spellResult = msg;
+	if (msg._delaySeconds) {
+		_spellResult = msg;
+	} else {
+		InfoMessage tmp = msg;
+		tmp._delaySeconds = 3;
+		_spellResult = tmp;
+	}
 
 	setMode(SPELL_RESULT);
 }