1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-17 00:07:41 +02:00

Removed object recycling that was causing #796. Fixed text nr typo.

Corrected json include in client/Client.cpp.
This commit is contained in:
Michał W. Urbańczyk
2011-09-01 01:40:46 +00:00
parent d49058049e
commit 20a53b04fd
5 changed files with 31 additions and 18 deletions

View File

@ -850,7 +850,7 @@ void CPlayerInterface::battleAttack(const BattleAttack *ba)
if (ba->deathBlow())
{
const CStack *stack = cb->battleGetStackByID(ba->stackAttacking);
std::string hlp = CGI->generaltexth->allTexts[(stack->count != 1) ? 336 : 335];
std::string hlp = CGI->generaltexth->allTexts[(stack->count != 1) ? 366 : 365];
boost::algorithm::replace_first(hlp,"%s", (stack->count != 1) ? stack->getCreature()->namePl.c_str() : stack->getCreature()->nameSing.c_str());
battleInt->console->addText(hlp);
for (std::vector<BattleStackAttacked>::const_iterator i = ba->bsa.begin(); i != ba->bsa.end(); i++)