From 9c93d907dcf09bd84a56b9af56c94810643b81ca Mon Sep 17 00:00:00 2001
From: Mads Buvik Sandvei <madssandvei@zoho.com>
Date: Thu, 2 Nov 2023 19:30:51 +0100
Subject: [PATCH] Settings page entry for the "player movement ignores
 animation" setting.

---
 apps/launcher/settingspage.cpp |  2 ++
 files/ui/settingspage.ui       | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/apps/launcher/settingspage.cpp b/apps/launcher/settingspage.cpp
index 5869cc3a73..b8539671b5 100644
--- a/apps/launcher/settingspage.cpp
+++ b/apps/launcher/settingspage.cpp
@@ -191,6 +191,7 @@ bool Launcher::SettingsPage::loadSettings()
         }
         loadSettingBool(Settings::game().mTurnToMovementDirection, *turnToMovementDirectionCheckBox);
         loadSettingBool(Settings::game().mSmoothMovement, *smoothMovementCheckBox);
+        loadSettingBool(Settings::game().mPlayerMovementIgnoresAnimation, *playerMovementIgnoresAnimationCheckBox);
 
         distantLandCheckBox->setCheckState(
             Settings::terrain().mDistantTerrain && Settings::terrain().mObjectPaging ? Qt::Checked : Qt::Unchecked);
@@ -338,6 +339,7 @@ void Launcher::SettingsPage::saveSettings()
         saveSettingBool(*shieldSheathingCheckBox, Settings::game().mShieldSheathing);
         saveSettingBool(*turnToMovementDirectionCheckBox, Settings::game().mTurnToMovementDirection);
         saveSettingBool(*smoothMovementCheckBox, Settings::game().mSmoothMovement);
+        saveSettingBool(*playerMovementIgnoresAnimationCheckBox, Settings::game().mPlayerMovementIgnoresAnimation);
 
         const bool wantDistantLand = distantLandCheckBox->checkState() == Qt::Checked;
         if (wantDistantLand != (Settings::terrain().mDistantTerrain && Settings::terrain().mObjectPaging))
diff --git a/files/ui/settingspage.ui b/files/ui/settingspage.ui
index c61b4f4229..45fbc11a12 100644
--- a/files/ui/settingspage.ui
+++ b/files/ui/settingspage.ui
@@ -14,7 +14,7 @@
    <item>
     <widget class="QTabWidget" name="AdvancedTabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="GameMechanics">
       <attribute name="title">
@@ -293,8 +293,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>680</width>
-            <height>882</height>
+            <width>671</width>
+            <height>774</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout">
@@ -377,6 +377,16 @@
                 </item>
                </layout>
               </item>
+              <item row="2" column="1">
+               <widget class="QCheckBox" name="playerMovementIgnoresAnimationCheckBox">
+                <property name="toolTip">
+                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;In third person, the camera will bob along with the movement animations of the player. Enabling this option disables this by having the player character move independently of its animation. This was the default behavior of OpenMW 0.48 and earlier.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                </property>
+                <property name="text">
+                 <string>Player movement ignores animation</string>
+                </property>
+               </widget>
+              </item>
              </layout>
             </widget>
            </item>