games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Fix missing error message on casting spell in hotseat

Browse Source
This commit is contained in:
Ivan Savenko
2023-04-20 19:24:13 +03:00
parent 6df85be4b3
commit f245080cba
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.md
View File

@@ -8,12 +8,13 @@
* Fixed good morale happening after defeating last enemy unit * Fixed good morale happening after defeating last enemy unit
* Fixed death animation of Efreeti killed by petrification attack * Fixed death animation of Efreeti killed by petrification attack
* Adventure map spells are no longer visible on units in battle * 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 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 * 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 centering of scenario information window
* Fixed crash on empty save game list after filtering * Fixed crash on empty save game list after filtering
* Fixed blocked progress in Launcher on language detection failure * 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 # 1.1.1 -> 1.2.0

8
client/windows/CSpellWindow.cpp
View File

@@ -509,7 +509,7 @@ void CSpellWindow::SpellArea::clickLeft(tribool down, bool previousState)
auto spellCost = owner->myInt->cb->getSpellCost(mySpell, owner->myHero); auto spellCost = owner->myInt->cb->getSpellCost(mySpell, owner->myHero);
if(spellCost > owner->myHero->mana) //insufficient mana 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; return;
} }
@@ -529,7 +529,7 @@ void CSpellWindow::SpellArea::clickLeft(tribool down, bool previousState)
if((combatSpell ^ inCombat) || inCastle) if((combatSpell ^ inCombat) || inCastle)
{ {
std::vector<std::shared_ptr<CComponent>> hlp(1, std::make_shared<CComponent>(CComponent::spell, mySpell->id, 0)); std::vector<std::shared_ptr<CComponent>> hlp(1, std::make_shared<CComponent>(CComponent::spell, mySpell->id, 0));
owner->myInt->showInfoDialog(mySpell->getDescriptionTranslated(schoolLevel), hlp); LOCPLINT->showInfoDialog(mySpell->getDescriptionTranslated(schoolLevel), hlp);
} }
else if(combatSpell) else if(combatSpell)
{ {
@@ -544,9 +544,9 @@ void CSpellWindow::SpellArea::clickLeft(tribool down, bool previousState)
std::vector<std::string> texts; std::vector<std::string> texts;
problem.getAll(texts); problem.getAll(texts);
if(!texts.empty()) if(!texts.empty())
owner->myInt->showInfoDialog(texts.front()); LOCPLINT->showInfoDialog(texts.front());
else else
owner->myInt->showInfoDialog(CGI->generaltexth->translate("vcmi.adventureMap.spellUnknownProblem")); LOCPLINT->showInfoDialog(CGI->generaltexth->translate("vcmi.adventureMap.spellUnknownProblem"));
} }
} }
else //adventure spell else //adventure spell