summaryrefslogtreecommitdiff
path: root/src/gui/npc_text.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-24 22:42:33 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-24 22:43:04 +0100
commitf4704ccd2a71ca222d8584aac42c80d346a0b688 (patch)
tree235f4c1bb016656aed477ece08d9793c1668b024 /src/gui/npc_text.cpp
parent606541e5611737a9e13148f7007df7670d74e132 (diff)
downloadmana-f4704ccd2a71ca222d8584aac42c80d346a0b688.tar.gz
mana-f4704ccd2a71ca222d8584aac42c80d346a0b688.tar.bz2
mana-f4704ccd2a71ca222d8584aac42c80d346a0b688.tar.xz
mana-f4704ccd2a71ca222d8584aac42c80d346a0b688.zip
Fixed compile warnings
Order of initialization and suggested parenthesis.
Diffstat (limited to 'src/gui/npc_text.cpp')
-rw-r--r--src/gui/npc_text.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index be67fb6e..f4754ef7 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -100,7 +100,7 @@ void NpcTextDialog::action(const gcn::ActionEvent &event)
current_npc->nextDialog();
addText("\n> Next\n");
} else if (mState == NPC_TEXT_STATE_CLOSE ||
- mState == NPC_TEXT_STATE_NEXT && !current_npc) {
+ (mState == NPC_TEXT_STATE_NEXT && !current_npc)) {
setText("");
setVisible(false);
if (current_npc) current_npc->handleDeath();