1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00

Merged changes from trunk (since r452)

This commit is contained in:
Michał W. Urbańczyk
2008-06-11 01:58:18 +00:00
parent dbca25df74
commit dd9b506293
9 changed files with 329 additions and 128 deletions

View File

@@ -2080,14 +2080,14 @@ void CPlayerInterface::battleStackAttacking(int ID, int dest)
dynamic_cast<CBattleInterface*>(curint)->stackAttacking(ID, dest);
}
void CPlayerInterface::battleStackIsAttacked(int ID)
void CPlayerInterface::battleStackIsAttacked(int ID, int dmg, int killed, int IDby)
{
dynamic_cast<CBattleInterface*>(curint)->stackIsAttacked(ID);
dynamic_cast<CBattleInterface*>(curint)->stackIsAttacked(ID, dmg, killed, IDby);
}
void CPlayerInterface::battleStackKilled(int ID)
void CPlayerInterface::battleStackKilled(int ID, int dmg, int killed, int IDby)
{
dynamic_cast<CBattleInterface*>(curint)->stackKilled(ID);
dynamic_cast<CBattleInterface*>(curint)->stackKilled(ID, dmg, killed, IDby);
}
void CPlayerInterface::showComp(SComponent comp)