minor changes

Author: Farmer-Markus

extras/videoDrivers/SDL2/VideoSDL2.cpp

@@ -31,11 +31,14 @@
 #endif
 
 #define CHECK_SDL(call)                 \
-    do                                  \
-    {                                   \
+    ([&]() -> bool {                    \
         if((call) == -1)                \
+        {                               \
             PrintError(SDL_GetError()); \
-    } while(false)
+            return false;               \
+        }                               \
+        return true;                    \
+    })()
 
 namespace {
 template<typename T>
@@ -541,7 +544,7 @@ void VideoSDL2::MoveWindowToCenter()
     SDL_Rect usableBounds;
     CHECK_SDL(SDL_GetDisplayUsableBounds(SDL_GetWindowDisplayIndex(window), &usableBounds));
     int top, left, bottom, right;
-    if(SDL_GetWindowBordersSize(window, &top, &left, &bottom, &right) != 0)
+    if(CHECK_SDL(SDL_GetWindowBordersSize(window, &top, &left, &bottom, &right)) != 0)
         top = left = bottom = right = 0;
     usableBounds.w -= left + right;
     usableBounds.h -= top + bottom;

libs/s25main/Settings.cpp

@@ -322,8 +322,8 @@ void Settings::Load()
             interface.mapScrollMode = static_cast<MapScrollMode>(iniInterface->getIntValue("map_scroll_mode"));
         } catch(const std::runtime_error&)
         {
-            // ScrollSame(old invertMouse) is 0 so invert value
-            interface.mapScrollMode = static_cast<MapScrollMode>(!iniInterface->getBoolValue("invert_mouse"));
+            interface.mapScrollMode =
+              iniInterface->getBoolValue("invert_mouse") ?  MapScrollMode::ScrollSame : MapScrollMode::ScrollOpposite;
             s25util::warning(
               "Value 'map_scroll_mode' not found! Using 'invert_mouse' instead - please recheck your settings!");
         }

libs/s25main/TerrainRenderer.cpp

@@ -808,7 +808,7 @@ void TerrainRenderer::Draw(const Position& firstPt, const Position& lastPt, cons
 #else
     // Modulate2x
     glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
-    glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE, 2.0f);
+    glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE, TEXTURE_COLOR_DIVISOR);
 #endif
 
     // Disable alpha blending

libs/s25main/WindowManager.cpp

@@ -5,11 +5,13 @@
 #include "WindowManager.h"
 #include "CollisionDetection.h"
 #include "Loader.h"
+#include "Point.h"
 #include "RttrConfig.h"
 #include "Settings.h"
 #include "Window.h"
 #include "commonDefines.h"
 #include "desktops/Desktop.h"
+#include "driver/MouseCoords.h"
 #include "drivers/ScreenResizeEvent.h"
 #include "drivers/VideoDriverWrapper.h"
 #include "files.h"
@@ -26,8 +28,13 @@
 #include "s25util/MyTime.h"
 #include <algorithm>
 
-// Calc square
-#define SQR(x) ((x) * (x))
+namespace {
+template<typename T>
+constexpr T square(T x)
+{
+    return x * x;
+}
+} // namespace
 
 WindowManager::WindowManager()
     : cursor_(Cursor::Hand), disable_mouse(false), lastMousePos(Position::Invalid()), curRenderSize(0, 0),
@@ -360,18 +367,18 @@ void WindowManager::Msg_LeftUp(MouseCoords mc)
     // Ggf. Doppelklick untersuche
     unsigned time_now = VIDEODRIVER.GetTickCount();
 
-    if(!VIDEODRIVER.IsTouch())
+    if(VIDEODRIVER.IsTouch())
     {
-        if(time_now - lastLeftClickTime < DOUBLE_CLICK_INTERVAL && mc.pos == lastLeftClickPos)
-            mc.dbl_click = true;
+        if(time_now - lastLeftClickTime < TOUCH_DOUBLE_CLICK_INTERVAL)
+        {
+            // Calculate distance between two points
+            const PointF diff = static_cast<PointF>(mc.pos - lastLeftClickPos);
+            if(square(diff.x) + square(diff.y) <= square(TOUCH_MAX_DOUBLE_CLICK_DISTANCE))
+                mc.dbl_click = true;
+        }
 
-    } else if(time_now - lastLeftClickTime < TOUCH_DOUBLE_CLICK_INTERVAL)
-    {
-        // Calculate distance between two points
-        unsigned cDistance = SQR(mc.pos.x - lastLeftClickPos.x) + SQR(mc.pos.y - lastLeftClickPos.y);
-        if(cDistance <= SQR(TOUCH_MAX_DOUBLE_CLICK_DISTANCE))
-            mc.dbl_click = true;
-    }
+    } else if(time_now - lastLeftClickTime < DOUBLE_CLICK_INTERVAL && mc.pos == lastLeftClickPos)
+        mc.dbl_click = true;
 
     if(!mc.dbl_click)
     {

libs/s25main/desktops/dskGameInterface.h

@@ -117,7 +117,7 @@ class dskGameInterface :
     /// Updatet das Post-Icon mit der Nachrichtenanzahl und der Taube
     void UpdatePostIcon(unsigned postmessages_count, bool showPigeon);
 
-    /// Wird beim Linksklick ausgeführt und überprüft die klick Position auf Gebäude/Straßen
+    /// Executed during left click. Checks click pos for buildings/roads
     bool ContextClick(const MouseCoords& mc);
 
     void Msg_ButtonClick(unsigned ctrl_id) override;