From 9e6a0f98ecb52e04ab5afce817cb1d7fe2076450 Mon Sep 17 00:00:00 2001
From: Erik Schilling <ablu.erikschilling@googlemail.com>
Date: Thu, 11 Apr 2013 11:10:47 +0200
Subject: Moved Actor into an Component

This was the final step to remove the hierachy with Entity on the top.
---
 src/game-server/npc.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/game-server/npc.cpp')

diff --git a/src/game-server/npc.cpp b/src/game-server/npc.cpp
index f9e714b9..7806e510 100644
--- a/src/game-server/npc.cpp
+++ b/src/game-server/npc.cpp
@@ -99,8 +99,9 @@ void Npc::start(Entity *npc, Entity *ch)
         script->prepare(talkCallback);
         script->push(npc);
         script->push(ch);
-        ch->getComponent<CharacterComponent>()
-                ->startNpcThread(thread, static_cast<Actor*>(npc)->getPublicID());
+        auto *actorComponent = npc->getComponent<ActorComponent>();
+        ch->getComponent<CharacterComponent>()->startNpcThread(
+                thread, actorComponent->getPublicID());
     }
 }
 
-- 
cgit v1.2.3-70-g09d2