diff options
| -rw-r--r-- | src/net/ea/npchandler.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp index 6fb719a1..fc81ca03 100644 --- a/src/net/ea/npchandler.cpp +++ b/src/net/ea/npchandler.cpp @@ -57,8 +57,6 @@ NpcHandler::NpcHandler() void NpcHandler::handleMessage(Net::MessageIn &msg) { - bool resetPlayer = true; - if (msg.getId() == SMSG_NPC_CHOICE || msg.getId() == SMSG_NPC_MESSAGE) { msg.readInt16(); // length @@ -66,7 +64,7 @@ void NpcHandler::handleMessage(Net::MessageIn &msg) int npcId = msg.readInt32(); NpcDialogs::iterator diag = mNpcDialogs.find(npcId); - NpcDialog *dialog; + NpcDialog *dialog = 0; if (diag == mNpcDialogs.end()) { @@ -124,7 +122,7 @@ void NpcHandler::handleMessage(Net::MessageIn &msg) break; } - if (resetPlayer && player_node->getCurrentAction() != Being::SIT) + if (player_node->getCurrentAction() != Being::SIT) player_node->setAction(Being::STAND); } |