From f245080cba7a52a3242e50f8f7c5e236383bc092 Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Thu, 20 Apr 2023 19:24:13 +0300 Subject: [PATCH] Fix missing error message on casting spell in hotseat --- ChangeLog.md | 3 ++- client/windows/CSpellWindow.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 99bdd07bc..93f0b7c9a 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -8,12 +8,13 @@ * Fixed good morale happening after defeating last enemy unit * Fixed death animation of Efreeti killed by petrification attack * Adventure map spells are no longer visible on units in battle +* Attempt to cast spell with no valid targets in hotseat will show appropriate error message * RMG settings will now show all existing in game templates and not just those suitable for current settings * RMG settings (map size and two-level maps) that are not compatible with current template will be blocked * Fixed centering of scenario information window * Fixed crash on empty save game list after filtering * Fixed blocked progress in Launcher on language detection failure -* Launcher will now correctly handle selection of Data directory in H3 install +* Launcher will now correctly handle selection of Ddata directory in H3 install # 1.1.1 -> 1.2.0 diff --git a/client/windows/CSpellWindow.cpp b/client/windows/CSpellWindow.cpp index 6150ab154..1bc1327e9 100644 --- a/client/windows/CSpellWindow.cpp +++ b/client/windows/CSpellWindow.cpp @@ -509,7 +509,7 @@ void CSpellWindow::SpellArea::clickLeft(tribool down, bool previousState) auto spellCost = owner->myInt->cb->getSpellCost(mySpell, owner->myHero); if(spellCost > owner->myHero->mana) //insufficient mana { - owner->myInt->showInfoDialog(boost::str(boost::format(CGI->generaltexth->allTexts[206]) % spellCost % owner->myHero->mana)); + LOCPLINT->showInfoDialog(boost::str(boost::format(CGI->generaltexth->allTexts[206]) % spellCost % owner->myHero->mana)); return; } @@ -529,7 +529,7 @@ void CSpellWindow::SpellArea::clickLeft(tribool down, bool previousState) if((combatSpell ^ inCombat) || inCastle) { std::vector> hlp(1, std::make_shared(CComponent::spell, mySpell->id, 0)); - owner->myInt->showInfoDialog(mySpell->getDescriptionTranslated(schoolLevel), hlp); + LOCPLINT->showInfoDialog(mySpell->getDescriptionTranslated(schoolLevel), hlp); } else if(combatSpell) { @@ -544,9 +544,9 @@ void CSpellWindow::SpellArea::clickLeft(tribool down, bool previousState) std::vector texts; problem.getAll(texts); if(!texts.empty()) - owner->myInt->showInfoDialog(texts.front()); + LOCPLINT->showInfoDialog(texts.front()); else - owner->myInt->showInfoDialog(CGI->generaltexth->translate("vcmi.adventureMap.spellUnknownProblem")); + LOCPLINT->showInfoDialog(CGI->generaltexth->translate("vcmi.adventureMap.spellUnknownProblem")); } } else //adventure spell