From 6576d46a7f420edfc53226811a3158d6e509a7bc Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 23 Jul 2014 12:45:57 +0300
Subject: Fix compilation warnings and fix issue introduced in last commits.

---
 src/gui/windows/npcdialog.cpp | 4 ++--
 src/gui/windows/npcdialog.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/gui/windows')

diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index 0ccae687b..aab395a85 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -824,7 +824,7 @@ void NpcDialog::saveCamera()
     if (!viewport || mCameraMode >= 0)
         return;
 
-    mCameraMode = settings.cameraMode;
+    mCameraMode = static_cast<int>(settings.cameraMode);
     mCameraX = viewport->getCameraRelativeX();
     mCameraY = viewport->getCameraRelativeY();
 }
@@ -834,7 +834,7 @@ void NpcDialog::restoreCamera()
     if (!viewport || mCameraMode == -1)
         return;
 
-    if (settings.cameraMode != mCameraMode)
+    if (static_cast<int>(settings.cameraMode) != mCameraMode)
         viewport->toggleCameraMode();
     if (mCameraMode)
     {
diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h
index 7c72550c9..bd9c21678 100644
--- a/src/gui/windows/npcdialog.h
+++ b/src/gui/windows/npcdialog.h
@@ -296,7 +296,7 @@ class NpcDialog final : public Window,
         PlayerBox *mPlayerBox;
         Being *mAvatarBeing;
         int mLastNextTime;
-        unsigned int mCameraMode;
+        int mCameraMode;
         int mCameraX;
         int mCameraY;
         bool mShowAvatar;
-- 
cgit v1.2.3-60-g2f50