diff options
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/npchandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/playerhandler.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp index 26250d9e..a59ee814 100644 --- a/src/net/npchandler.cpp +++ b/src/net/npchandler.cpp @@ -76,12 +76,10 @@ void NPCHandler::handleMessage(MessageIn *msg) id = msg->readInt32(); if (current_npc == dynamic_cast<NPC*>(beingManager->findBeing(id))) current_npc = NULL; - NPC::mTalking = false; break; case SMSG_NPC_NEXT: // Next button in NPC dialog, currently unused - NPC::mTalking = false; break; case SMSG_NPC_INT_INPUT: diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp index c1e0d033..0637d784 100644 --- a/src/net/playerhandler.cpp +++ b/src/net/playerhandler.cpp @@ -82,14 +82,16 @@ namespace { player_node->revive(); deathNotice = NULL; npcIntegerDialog->setVisible(false); + npcListDialog->reset(); npcListDialog->setVisible(false); + npcStringDialog->setValue(""); npcStringDialog->setVisible(false); npcTextDialog->clearText(); npcTextDialog->setVisible(false); buyDialog->setVisible(false); sellDialog->setVisible(false); buySellDialog->setVisible(false); - current_npc = 0; + current_npc = NULL; } } deathListener; } |