Rename revert_mouse to invert_mouse

That is more conventional and correct as "revert" could mean "undo"

Author: Flamefire

libs/s25main/Settings.cpp

@@ -138,7 +138,7 @@ void Settings::LoadDefaults()
     // interface
     // {
     interface.autosave_interval = 0;
-    interface.revert_mouse = false;
+    interface.invert_mouse = false;
     // }
 
     // addons
@@ -295,7 +295,7 @@ void Settings::Load()
         // interface
         // {
         interface.autosave_interval = iniInterface->getIntValue("autosave_interval");
-        interface.revert_mouse = iniInterface->getBoolValue("revert_mouse");
+        interface.invert_mouse = iniInterface->getValue("invert_mouse", false);
         // }
 
         // addons
@@ -451,7 +451,7 @@ void Settings::Save()
     // interface
     // {
     iniInterface->setValue("autosave_interval", interface.autosave_interval);
-    iniInterface->setValue("revert_mouse", interface.revert_mouse);
+    iniInterface->setValue("invert_mouse", interface.invert_mouse);
     // }
 
     // addons

libs/s25main/Settings.h

@@ -104,7 +104,7 @@ class Settings : public Singleton<Settings, SingletonPolicies::WithLongevity>
     struct
     {
         unsigned autosave_interval;
-        bool revert_mouse;
+        bool invert_mouse;
     } interface;
 
     struct

libs/s25main/desktops/dskGameInterface.cpp

@@ -691,7 +691,7 @@ bool dskGameInterface::Msg_MouseMove(const MouseCoords& mc)
 
     int acceleration = SETTINGS.global.smartCursor ? 2 : 3;
 
-    if(SETTINGS.interface.revert_mouse)
+    if(SETTINGS.interface.invert_mouse)
         acceleration = -acceleration;
 
     gwv.MoveBy((mc.GetPos() - startScrollPt) * acceleration);

libs/s25main/desktops/dskOptions.cpp

@@ -247,7 +247,7 @@ dskOptions::dskOptions() : Desktop(LOADER.GetImageN("setup013", 0))
                                 _("When scrolling the map with the mouse move the camera."));
     invertScroll->AddTextButton(ID_btOn, curPos + ctrlOffset2, ctrlSize, TextureColor::Grey, _("Inverted"), NormalFont,
                                 _("When scrolling the map with the mouse move the map."));
-    invertScroll->SetSelection(SETTINGS.interface.revert_mouse);
+    invertScroll->SetSelection(SETTINGS.interface.invert_mouse);
     curPos.y += 30;
 
     groupAllgemein->AddText(ID_txtSmartCursor, curPos, _("Smart Cursor"), COLOR_YELLOW, FontStyle{}, NormalFont);

libs/s25main/ingameWindows/iwObservate.cpp

@@ -231,7 +231,7 @@ bool iwObservate::Msg_MouseMove(const MouseCoords& mc)
     {
         int acceleration = SETTINGS.global.smartCursor ? 2 : 3;
 
-        if(SETTINGS.interface.revert_mouse)
+        if(SETTINGS.interface.invert_mouse)
             acceleration = -acceleration;
 
         view->MoveBy((mc.GetPos() - scrollOrigin) * acceleration);

libs/s25main/ingameWindows/iwSettings.cpp

@@ -62,7 +62,7 @@ iwSettings::iwSettings()
 
     AddCheckBox(ID_cbInvertMouse, DrawPoint(15, 124), Extent(150, 26), TextureColor::Grey, _("Invert mouse"),
                 NormalFont, false)
-      ->setChecked(SETTINGS.interface.revert_mouse);
+      ->setChecked(SETTINGS.interface.invert_mouse);
     AddCheckBox(ID_cbStatisticScale, DrawPoint(200, 124), Extent(150, 26), TextureColor::Grey, _("Statistics Scale"),
                 NormalFont, false)
       ->setChecked(SETTINGS.ingame.scale_statistics);
@@ -105,7 +105,7 @@ void iwSettings::Msg_CheckboxChange(const unsigned ctrl_id, const bool checked)
 {
     switch(ctrl_id)
     {
-        case ID_cbInvertMouse: SETTINGS.interface.revert_mouse = checked; break;
+        case ID_cbInvertMouse: SETTINGS.interface.invert_mouse = checked; break;
         case ID_cbStatisticScale: SETTINGS.ingame.scale_statistics = checked; break;
     }
 }

tests/s25Main/integration/testDskGameInterface.cpp

@@ -67,7 +67,7 @@ void checkNotScrolling(const GameWorldView& view, Cursor cursor = Cursor::Hand)
 BOOST_FIXTURE_TEST_CASE(Scrolling, GameInterfaceFixture)
 {
     const int acceleration = 2;
-    SETTINGS.interface.revert_mouse = false;
+    SETTINGS.interface.invert_mouse = false;
 
     Position startPos(10, 15);
     MouseCoords mouse(startPos, false, true);
@@ -95,7 +95,7 @@ BOOST_FIXTURE_TEST_CASE(Scrolling, GameInterfaceFixture)
 
     // Inverted scrolling
     {
-        SETTINGS.interface.revert_mouse = true;
+        SETTINGS.interface.invert_mouse = true;
         WINDOWMANAGER.Msg_RightDown(mouse);
         startPos = mouse.pos;
         BOOST_TEST_REQUIRE(WINDOWMANAGER.GetCursor() == Cursor::Scroll);
@@ -106,7 +106,7 @@ BOOST_FIXTURE_TEST_CASE(Scrolling, GameInterfaceFixture)
         BOOST_TEST_REQUIRE(view->GetOffset() == pos - acceleration * Position(4, 3));
         mouse.rdown = false;
         WINDOWMANAGER.Msg_RightUp(mouse);
-        SETTINGS.interface.revert_mouse = false;
+        SETTINGS.interface.invert_mouse = false;
     }
 
     // Opening a window does not cancel scrolling