diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-03-21 19:44:11 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-03-25 20:32:37 +0100 |
| commit | 4e9e0ac87b4dc16f19ac4f930d52c4cc0a2c6f64 (patch) | |
| tree | 1b77436b4623c8c1fc4419758e623753899fd818 /src/game-server/state.cpp | |
| parent | 7aeb3b4a6c34a8f679719c207e51394d7e48828b (diff) | |
| download | manaserv-4e9e0ac87b4dc16f19ac4f930d52c4cc0a2c6f64.tar.gz manaserv-4e9e0ac87b4dc16f19ac4f930d52c4cc0a2c6f64.tar.bz2 manaserv-4e9e0ac87b4dc16f19ac4f930d52c4cc0a2c6f64.tar.xz manaserv-4e9e0ac87b4dc16f19ac4f930d52c4cc0a2c6f64.zip | |
Changed NPC to an NpcComponent added to a Being
Diffstat (limited to 'src/game-server/state.cpp')
| -rw-r--r-- | src/game-server/state.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/game-server/state.cpp b/src/game-server/state.cpp index ab0dcd79..673d48fa 100644 --- a/src/game-server/state.cpp +++ b/src/game-server/state.cpp @@ -274,9 +274,9 @@ static void informPlayer(MapComposite *map, Character *p) case OBJECT_NPC: { - NPC *q = static_cast< NPC * >(o); - enterMsg.writeInt16(q->getNPC()); - enterMsg.writeString(q->getName()); + NpcComponent *npcComponent = o->getComponent<NpcComponent>(); + enterMsg.writeInt16(npcComponent->getNpcId()); + enterMsg.writeString(o->getName()); } break; default: @@ -550,7 +550,7 @@ bool GameState::insert(Entity *ptr) break; case OBJECT_NPC: - LOG_DEBUG("NPC inserted: " << static_cast<NPC*>(obj)->getNPC()); + LOG_DEBUG("NPC inserted: " << obj->getComponent<NpcComponent>()->getNpcId()); break; case OBJECT_CHARACTER: @@ -624,7 +624,7 @@ void GameState::remove(Entity *ptr) break; case OBJECT_NPC: - LOG_DEBUG("NPC removed: " << static_cast<NPC*>(ptr)->getNPC()); + LOG_DEBUG("NPC removed: " << ptr->getComponent<NpcComponent>()->getNpcId()); break; case OBJECT_CHARACTER: |