From 648c85816ca9398dd9c672d5d4230bef030e0274 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 23 Jul 2014 02:30:20 +0300 Subject: move "change camera mode" option into gamemodifiers. --- src/gui/windows/npcdialog.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'src/gui/windows/npcdialog.cpp') diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index fac7714ed..0ccae687b 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -26,6 +26,7 @@ #include "configuration.h" #include "inventory.h" #include "item.h" +#include "settings.h" #include "soundconsts.h" #include "soundmanager.h" @@ -823,7 +824,7 @@ void NpcDialog::saveCamera() if (!viewport || mCameraMode >= 0) return; - mCameraMode = viewport->getCameraMode(); + mCameraMode = settings.cameraMode; mCameraX = viewport->getCameraRelativeX(); mCameraY = viewport->getCameraRelativeY(); } @@ -833,15 +834,10 @@ void NpcDialog::restoreCamera() if (!viewport || mCameraMode == -1) return; - if (!mCameraMode) + if (settings.cameraMode != mCameraMode) + viewport->toggleCameraMode(); + if (mCameraMode) { - if (viewport->getCameraMode() != mCameraMode) - viewport->toggleCameraMode(); - } - else - { - if (viewport->getCameraMode() != mCameraMode) - viewport->toggleCameraMode(); viewport->setCameraRelativeX(mCameraX); viewport->setCameraRelativeY(mCameraY); } -- cgit v1.2.3-60-g2f50