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

Merge pull request #1229 from IvanSavenko/battle_improvements

Browse Source 
Battle: Fixing bugs & Implementation of missing features
This commit is contained in:
Ivan Savenko
2023-01-09 22:07:13 +02:00
committed by GitHub
parent d9aab0a847 3e0bb3a7cc
commit 1fece0ce18
117 changed files with 4284 additions and 3295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/NetPacksClient.cpp
View File

@@ -741,7 +741,7 @@ void BattleResult::applyFirstCl(CClient *cl)
void BattleStackMoved::applyFirstCl(CClient *cl)
{
const CStack * movedStack = GS(cl)->curB->battleGetStackByID(stack);
callBattleInterfaceIfPresentForBothSides(cl, &IBattleEventsReceiver::battleStackMoved, movedStack, tilesToMove, distance);
callBattleInterfaceIfPresentForBothSides(cl, &IBattleEventsReceiver::battleStackMoved, movedStack, tilesToMove, distance, teleporting);
}
void BattleAttack::applyFirstCl(CClient *cl)
@@ -751,7 +751,7 @@ void BattleAttack::applyFirstCl(CClient *cl)
void BattleAttack::applyCl(CClient *cl)
{
callBattleInterfaceIfPresentForBothSides(cl, &IBattleEventsReceiver::battleStacksAttacked, bsa);
callBattleInterfaceIfPresentForBothSides(cl, &IBattleEventsReceiver::battleStacksAttacked, bsa, shot());
}
void StartAction::applyFirstCl(CClient *cl)
@@ -773,7 +773,7 @@ void SetStackEffect::applyCl(CClient *cl)
void StacksInjured::applyCl(CClient *cl)
{
callBattleInterfaceIfPresentForBothSides(cl, &IBattleEventsReceiver::battleStacksAttacked, stacks);
callBattleInterfaceIfPresentForBothSides(cl, &IBattleEventsReceiver::battleStacksAttacked, stacks, false);
}
void BattleResultsApplied::applyCl(CClient *cl)
@@ -785,7 +785,7 @@ void BattleResultsApplied::applyCl(CClient *cl)
void BattleUnitsChanged::applyCl(CClient * cl)
{
callBattleInterfaceIfPresentForBothSides(cl, &IBattleEventsReceiver::battleUnitsChanged, changedStacks, customEffects);
callBattleInterfaceIfPresentForBothSides(cl, &IBattleEventsReceiver::battleUnitsChanged, changedStacks);
}
void BattleObstaclesChanged::applyCl(CClient *cl)