summaryrefslogtreecommitdiff
path: root/src/game-server/state.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game-server/state.cpp')
-rw-r--r--src/game-server/state.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/game-server/state.cpp b/src/game-server/state.cpp
index 2527207a..3e2e4ab7 100644
--- a/src/game-server/state.cpp
+++ b/src/game-server/state.cpp
@@ -255,9 +255,8 @@ static void informPlayer(MapComposite *map, Entity *p)
// Send damage messages.
if (o->canFight())
{
- CombatComponent *combatComponent =
- o->getComponent<CombatComponent>();
- const Hits &hits = combatComponent->getHitsTaken();
+ auto *beingComponent = o->getComponent<BeingComponent>();
+ const Hits &hits = beingComponent->getHitsTaken();
for (Hits::const_iterator j = hits.begin(),
j_end = hits.end(); j != j_end; ++j)
{
@@ -517,7 +516,7 @@ void GameState::update(int tick)
a->getComponent<ActorComponent>()->clearUpdateFlags();
if (a->canFight())
{
- a->getComponent<CombatComponent>()->clearHitsTaken();
+ a->getComponent<BeingComponent>()->clearHitsTaken();
}
}
}