games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

* some work towards fix of 537

Browse Source 
* 338 seems to be fixed
This commit is contained in:
mateuszb
2011-02-10 14:44:21 +00:00
parent 979f77d900
commit d630d88ac1
4 changed files with 62 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
client/CSpellWindow.cpp
View File

@@ -16,7 +16,9 @@
#include <sstream>
#include <boost/algorithm/string/replace.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/foreach.hpp>
#include "CBitmapHandler.h"
#include "../lib/CHeroHandler.h"
/*
* CSpellWindow.cpp, part of VCMI engine
@@ -617,9 +619,32 @@ void CSpellWindow::SpellArea::clickLeft(tribool down, bool previousState)
//we will cast a spell
if(sp->combatSpell && owner->myInt->battleInt && owner->myInt->cb->battleCanCastSpell()) //if battle window is open
{
int spell = mySpell;
owner->fexitb();
owner->myInt->battleInt->castThisSpell(spell);
IBattleCallback::ESpellCastProblem problem = owner->myInt->cb->battleCanCastThisSpell(sp);
switch (problem)
{
case IBattleCallback::OK:
{
int spell = mySpell;
owner->fexitb();
owner->myInt->battleInt->castThisSpell(spell);
break;
}
case IBattleCallback::ANOTHER_ELEMENTAL_SUMMONED:
{
std::string text = CGI->generaltexth->allTexts[538], summoner, elemental, caster;
std::vector<const CStack *> stacks = owner->myInt->cb->battleGetStacks();
if (owner->myHero->type->sex)
{ //female
caster = CGI->generaltexth->allTexts[540];
}
else
{ //male
caster = CGI->generaltexth->allTexts[539];
}
owner->myInt->showInfoDialog(text);
}
}
}
else if(!sp->combatSpell && !owner->myInt->battleInt) //adventure spell
{