diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-02-25 07:54:38 -0700 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-02-25 07:54:38 -0700 |
| commit | 7a65eb17a322cb22e7940504797844114fb77d79 (patch) | |
| tree | c961a8bb4d43f557bf7b4d3b1977fd27a0f8303f /src/net | |
| parent | a996d4bff3cc5a35ee5cdb6cb5bdef920cf44120 (diff) | |
| download | mana-7a65eb17a322cb22e7940504797844114fb77d79.tar.gz mana-7a65eb17a322cb22e7940504797844114fb77d79.tar.bz2 mana-7a65eb17a322cb22e7940504797844114fb77d79.tar.xz mana-7a65eb17a322cb22e7940504797844114fb77d79.zip | |
Fix some problems with deleting NPCs early
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/npchandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp index 5ae2ac2e..ae521bd5 100644 --- a/src/net/npchandler.cpp +++ b/src/net/npchandler.cpp @@ -94,7 +94,7 @@ void NPCHandler::handleMessage(MessageIn *msg) // If we're talking to that NPC, show the next button if (temporaryNPC == current_npc) npcTextDialog->showNextButton(); - else + else if (temporaryNPC) // Otherwise, move on as an empty dialog doesn't help temporaryNPC->nextDialog(); break; |