Fixed compile warnings

Order of initialization and suggested parenthesis.

3 files changed, 7 insertions, 7 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();
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index a1373830..00b11b3c 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -93,7 +93,7 @@ class NpcTextDialog : public Window, public gcn::ActionListener
             NPC_TEXT_STATE_NEXT,
             NPC_TEXT_STATE_CLOSE
         };
-        int mState;
+        NPCTextState mState;
 };
 
 #endif // NPC_TEXT_H
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 37197cd2..b019edb9 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -121,6 +121,10 @@ Setup_Video::Setup_Video():
     mCustomCursorCheckBox(new CheckBox(_("Custom cursor"), mCustomCursorEnabled)),
     mParticleEffectsCheckBox(new CheckBox(_("Particle effects"), mParticleEffectsEnabled)),
     mNameCheckBox(new CheckBox(_("Show name"), mNameEnabled)),
+    mPickupNotifyLabel(new gcn::Label(_("Show pickup notification"))),
+    mPickupChatCheckBox(new CheckBox(_("in chat"), mPickupChatEnabled)),
+    mPickupParticleCheckBox(new CheckBox(_("as particle"),
+                           mPickupParticleEnabled)),
     mSpeechSlider(new Slider(0, 3)),
     mSpeechLabel(new gcn::Label("")),
     mAlphaSlider(new Slider(0.2, 1.0)),
@@ -138,11 +142,7 @@ Setup_Video::Setup_Video():
     mOverlayDetailField(new gcn::Label("")),
     mParticleDetail(3 - (int) config.getValue("particleEmitterSkip", 1)),
     mParticleDetailSlider(new Slider(0, 3)),
-    mParticleDetailField(new gcn::Label("")),
-    mPickupNotifyLabel(new gcn::Label(_("Show pickup notification"))),
-    mPickupChatCheckBox(new CheckBox(_("in chat"), mPickupChatEnabled)),
-    mPickupParticleCheckBox(new CheckBox(_("as particle"),
-                           mPickupParticleEnabled))
+    mParticleDetailField(new gcn::Label(""))
 {
     setOpaque(false);