summaryrefslogtreecommitdiff
path: root/src/gui/npc.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-02-23 23:46:23 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-02-23 23:46:23 +0000
commit5c1093ffa9fea3d979a720169e97ed31725e95c4 (patch)
tree3f40c4000c2f0317e12640eb818a781c3a892497 /src/gui/npc.cpp
parent1fcefe616a39c2e572b8078c5c51c8e81a59c487 (diff)
downloadmana-5c1093ffa9fea3d979a720169e97ed31725e95c4.tar.gz
mana-5c1093ffa9fea3d979a720169e97ed31725e95c4.tar.bz2
mana-5c1093ffa9fea3d979a720169e97ed31725e95c4.tar.xz
mana-5c1093ffa9fea3d979a720169e97ed31725e95c4.zip
Committed patch by Mra, which fixes multiple NPCs talks in one window and
moves the action listener used with BuySellDialog into that class.
Diffstat (limited to 'src/gui/npc.cpp')
-rw-r--r--src/gui/npc.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/npc.cpp b/src/gui/npc.cpp
index 4706112b..4049b061 100644
--- a/src/gui/npc.cpp
+++ b/src/gui/npc.cpp
@@ -108,7 +108,9 @@ void NpcListDialog::action(const std::string& eventId)
WFIFOB(6) = net_b_value(selectedIndex + 1);
WFIFOSET(7);
setVisible(false);
+ current_npc = 0;
reset();
+
}
}
else if (eventId == "cancel") {
@@ -119,5 +121,6 @@ void NpcListDialog::action(const std::string& eventId)
WFIFOSET(7);
setVisible(false);
reset();
+ current_npc = 0;
}
}