[Scummvm-git-logs] scummvm master -> 021698b7e7e44aa1598b57b347f47c0dfa2a55ef

[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:
021698b7e7 MM: XEEN: Better fix for Day Of Sorcery crash


Commit: 021698b7e7e44aa1598b57b347f47c0dfa2a55ef
    https://github.com/scummvm/scummvm/commit/021698b7e7e44aa1598b57b347f47c0dfa2a55ef
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-06-04T22:34:27-07:00

Commit Message:
MM: XEEN: Better fix for Day Of Sorcery crash

Changed paths:
    engines/mm/xeen/dialogs/dialogs_items.cpp


diff --git a/engines/mm/xeen/dialogs/dialogs_items.cpp b/engines/mm/xeen/dialogs/dialogs_items.cpp
index bfd89837546..ca8238dd966 100644
--- a/engines/mm/xeen/dialogs/dialogs_items.cpp
+++ b/engines/mm/xeen/dialogs/dialogs_items.cpp
@@ -782,14 +782,12 @@ int ItemsDialog::doItemOptions(Character &c, int actionIndex, int itemIndex, Ite
 							--i._state._counter;
 
 							_oldCharacter = &c;
-							// FIXME: Some spells use combat._oldCharacter, and it may not be set
-							// if an item is used directly after the game is started
-							if (!combat._oldCharacter)
-								combat._oldCharacter = &c;
+							combat._oldCharacter = _oldCharacter;
 
 							windows[30].close();
 							windows[29].close();
 							windows[24].close();
+
 							spells.castItemSpell(i._id);
 
 							if (!i._state._counter) {