[Scummvm-git-logs] scummvm master -> 3c6d09e93aa71f41b2b528708cfbaf3e120f38b9

[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:
3c6d09e93a MM: MM1: Fix assert closing char inventory in combat mode


Commit: 3c6d09e93aa71f41b2b528708cfbaf3e120f38b9
    https://github.com/scummvm/scummvm/commit/3c6d09e93aa71f41b2b528708cfbaf3e120f38b9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-03-29T22:09:14-07:00

Commit Message:
MM: MM1: Fix assert closing char inventory in combat mode

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


diff --git a/engines/mm/mm1/views_enh/combat.cpp b/engines/mm/mm1/views_enh/combat.cpp
index 923fa53a67d..3bdd03eaa21 100644
--- a/engines/mm/mm1/views_enh/combat.cpp
+++ b/engines/mm/mm1/views_enh/combat.cpp
@@ -429,8 +429,6 @@ void Combat::writeOptions() {
 }
 
 void Combat::writeAllOptions() {
-	assert(g_globals->_currCharacter &&
-		g_globals->_currCharacter == g_globals->_combatParty[_currentChar]);
 	const Character &c = *g_globals->_currCharacter;
 	writeBottomText(0, 0, STRING["dialogs.combat.options_for"]);
 	writeBottomText(0, 2, c._name);