MM: MM1: Persist party chars' selected spells in savegames

Author: dreammaster

engines/mm/mm1/data/party.cpp

@@ -144,8 +144,15 @@ void Party::synchronize(Common::Serializer &s) {
 	if (s.isLoading())
 		resize(partySize);
 
-	for (int i = 0; i < partySize; ++i)
-		(*this)[i].synchronize(s);
+	for (int i = 0; i < partySize; ++i) {
+		// Sync the common properties
+		Character &c = (*this)[i];
+		c.synchronize(s);
+
+		// Sync extra properties
+		s.syncAsSByte(c._combatSpell);
+		s.syncAsSByte(c._nonCombatSpell);
+	}
 
 	if (s.isLoading())
 		g_globals->_currCharacter = &front();

engines/mm/mm1/views_enh/spells/cast_spell.cpp

@@ -144,6 +144,11 @@ void CastSpell::updateSelectedSpell() {
 	}
 }
 
+void CastSpell::charSwitched(Character *priorChar) {
+	PartyView::charSwitched(priorChar);
+	updateSelectedSpell();
+}
+
 void CastSpell::castSpell(Character *target) {
 	if (!isMagicAllowed()) {
 		g_events->send(InfoMessage(STRING["spells.magic_doesnt_work"]));

engines/mm/mm1/views_enh/spells/cast_spell.h

@@ -53,6 +53,12 @@ class CastSpell : public PartyView, public MM1::Game::SpellCasting {
 	 */
 	void spellError();
 
+protected:
+	/**
+	 * Called when the selected character has been switched
+	 */
+	void charSwitched(Character *priorChar) override;
+
 public:
 	CastSpell();
 	virtual ~CastSpell() {}