diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-12-11 15:47:35 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-12-11 15:47:35 +0000 |
| commit | 8da32105732949b4b0273c718d118bcfae70a1c9 (patch) | |
| tree | 0a354974d48268cfaafcdb1e06b498fa26a59c1e /src/net/npchandler.cpp | |
| parent | f9ce4e302cb3ed203d89a7a18e10b7ad4f11519c (diff) | |
| download | mana-8da32105732949b4b0273c718d118bcfae70a1c9.tar.gz mana-8da32105732949b4b0273c718d118bcfae70a1c9.tar.bz2 mana-8da32105732949b4b0273c718d118bcfae70a1c9.tar.xz mana-8da32105732949b4b0273c718d118bcfae70a1c9.zip | |
Merged 0.0 changes from revision 2825 to 2898 to trunk.
Diffstat (limited to 'src/net/npchandler.cpp')
| -rw-r--r-- | src/net/npchandler.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp index 9c89e71f..02204a84 100644 --- a/src/net/npchandler.cpp +++ b/src/net/npchandler.cpp @@ -49,20 +49,22 @@ NPCHandler::NPCHandler() void NPCHandler::handleMessage(MessageIn &msg) { + int id; + switch (msg.getId()) { case SMSG_NPC_CHOICE: msg.readShort(); // length - current_npc = dynamic_cast<NPC*>( - beingManager->findBeing(msg.readLong())); + id = msg.readLong(); + current_npc = dynamic_cast<NPC*>(beingManager->findBeing(id)); npcListDialog->parseItems(msg.readString(msg.getLength() - 8)); npcListDialog->setVisible(true); break; case SMSG_NPC_MESSAGE: msg.readShort(); // length - current_npc = dynamic_cast<NPC*>( - beingManager->findBeing(msg.readLong())); + id = msg.readLong(); + current_npc = dynamic_cast<NPC*>(beingManager->findBeing(id)); npcTextDialog->addText(msg.readString(msg.getLength() - 8)); npcListDialog->setVisible(false); npcTextDialog->setVisible(true); |