games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Issue2888 (#421)

Browse Source 
Fixed issue 2888
* Merged AFTER_ATTACK & BEFORE_ATTACK cast modes.
* Introduced new caster class for creature ability usage
* Added few tests
This commit is contained in:
Alexander Shishkin
2018-03-02 13:22:51 +03:00
committed by GitHub
parent 386805c4e0
commit 8b002ad774
26 changed files with 450 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/battle/CUnitState.cpp
View File

@@ -606,7 +606,7 @@ void CUnitState::getCasterName(MetaString & text) const
addNameReplacement(text, true);
}
void CUnitState::getCastDescription(const spells::Spell * spell, MetaString & text) const
void CUnitState::getCastDescription(const spells::Spell * spell, const std::vector<const Unit *> & attacked, MetaString & text) const
{
text.addTxt(MetaString::GENERAL_TXT, 565);//The %s casts %s
//todo: use text 566 for single creature
@@ -614,11 +614,6 @@ void CUnitState::getCastDescription(const spells::Spell * spell, MetaString & te
text.addReplacement(MetaString::SPELL_NAME, spell->getIndex());
}
void CUnitState::getCastDescription(const spells::Spell * spell, const std::vector<const Unit *> & attacked, MetaString & text) const
{
getCastDescription(spell, text);
}
bool CUnitState::ableToRetaliate() const
{
return alive()