[Scummvm-git-logs] scummvm master -> 4c5592f28666f8608d0509c8f53a65106fd11aaf

dreammaster dreammaster at scummvm.org
Sat Mar 24 21:01:47 CET 2018


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:
4c5592f286 XEEN: Fix purchasing spells from the guild


Commit: 4c5592f28666f8608d0509c8f53a65106fd11aaf
    https://github.com/scummvm/scummvm/commit/4c5592f28666f8608d0509c8f53a65106fd11aaf
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-24T16:01:43-04:00

Commit Message:
XEEN: Fix purchasing spells from the guild

Changed paths:
    engines/xeen/dialogs/dialogs_spells.cpp


diff --git a/engines/xeen/dialogs/dialogs_spells.cpp b/engines/xeen/dialogs/dialogs_spells.cpp
index b189059..11c4998 100644
--- a/engines/xeen/dialogs/dialogs_spells.cpp
+++ b/engines/xeen/dialogs/dialogs_spells.cpp
@@ -201,14 +201,14 @@ Character *SpellsDialog::execute(ButtonContainer *priorDialog, Character *c, int
 
 					Common::String msg = (modeCopy & 0x80) ?
 						Common::String::format(Res.SPELL_INFO, spellName.c_str(), spellDesc.c_str()) :
-						Common::String::format(Res.SPELL_PURCHASE, spellName.c_str(), spellCost);
+						Common::String::format(Res.SPELL_PURCHASE, spellDesc.c_str(), spellName.c_str(), spellCost);
 
 					if (Confirm::show(_vm, msg, modeCopy + 1)) {
 						if (party.subtract(CONS_GOLD, spellCost, WHERE_PARTY, WT_FREEZE_WAIT)) {
 							c->_spells[spellIndex] = true;
 							sound.stopSound();
 							intf._overallFrame = 0;
-							sound.playSound(ccNum ? "guild12.voc" : "parrot2.voc", 1);
+							sound.playSound(ccNum ? "parrot2.voc" : "guild12.voc", 1);
 						} else {
 							sound.playFX(21);
 						}





More information about the Scummvm-git-logs mailing list