Updated to latest commit, added few changes

Author: Farmer-Markus

extras/videoDrivers/SDL2/VideoSDL2.cpp

@@ -32,12 +32,11 @@
 
 #define CHECK_SDL(call)                 \
     ([&]() -> bool {                    \
-        if((call) == -1)                \
-        {                               \
-            PrintError(SDL_GetError()); \
-            return false;               \
-        }                               \
-        return true;                    \
+        if((call) < 0)                  \
+            return true;                \
+                                        \
+        PrintError(SDL_GetError());     \
+        return false;                   \
     })()
 
 namespace {
@@ -249,10 +248,16 @@ bool VideoSDL2::ResizeScreen(const VideoMode& newSize, bool fullscreen)
     return true;
 }
 
+#ifdef __ANDROID__ 
+void VideoSDL2::PrintError(const std::string&) const
+{ // Not really sure why the nowide::cerr function completely crashes on android
+}
+#else
 void VideoSDL2::PrintError(const std::string& msg) const
 {
     boost::nowide::cerr << msg << std::endl;
 }
+#endif
 
 void VideoSDL2::ShowErrorMessage(const std::string& title, const std::string& message)
 {

libs/s25main/TerrainRenderer.cpp

@@ -802,7 +802,7 @@ void TerrainRenderer::Draw(const Position& firstPt, const Position& lastPt, cons
     }
 
 #if RTTR_OGL_GL4ES
-    // Gl4ES behaves weird with GL_COMBINE. All textures are too bright. The function might not be implemented in GL4ES
+    // Gl4ES behaves weird with GL_COMBINE. All textures are too bright and some shadows are missing. The function might not be implemented in GL4ES
     // at all.
     glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 #else

libs/s25main/WindowManager.cpp

@@ -27,10 +27,12 @@
 #include "s25util/Log.h"
 #include "s25util/MyTime.h"
 #include <algorithm>
+#include <type_traits>
+
 
 namespace {
-template<typename T>
-constexpr T square(T x)
+template<typename T, std::enable_if_t<std::is_integral_v<T>, int> = 0>
+constexpr std::make_unsigned_t<T> square(T x)
 {
     return x * x;
 }
@@ -372,7 +374,7 @@ void WindowManager::Msg_LeftUp(MouseCoords mc)
         if(time_now - lastLeftClickTime < TOUCH_DOUBLE_CLICK_INTERVAL)
         {
             // Calculate distance between two points
-            const PointF diff = static_cast<PointF>(mc.pos - lastLeftClickPos);
+            const Point<int> diff = mc.pos - lastLeftClickPos;
             if(square(diff.x) + square(diff.y) <= square(TOUCH_MAX_DOUBLE_CLICK_DISTANCE))
                 mc.dbl_click = true;
         }

libs/s25main/desktops/dskGameInterface.cpp

@@ -662,8 +662,7 @@ void dskGameInterface::Msg_PaintAfter()
     }
 
     // Draw speed indicator icon
-    const int speedStep =
-      static_cast<int>(SPEED_GF_LENGTHS[referenceSpeed] / 10ms) - static_cast<int>(GAMECLIENT.GetGFLength() / 10ms);
+    const int speedStep = static_cast<int>(REFERENCE_SPEED / 10ms) - static_cast<int>(GAMECLIENT.GetGFLength() / 10ms);
 
     if(speedStep != 0)
     {

tests/s25Main/UI/testWindowManager.cpp

@@ -7,6 +7,7 @@
 #include "Settings.h"
 #include "WindowManager.h"
 #include "desktops/Desktop.h"
+#include "driver/MouseCoords.h"
 #include "helpers/containerUtils.h"
 #include "ingameWindows/IngameWindow.h"
 #include "ingameWindows/TransmitSettingsIgwAdapter.h"
@@ -70,17 +71,11 @@ BOOST_FIXTURE_TEST_CASE(LeftClick, WMFixture)
 {
     video->tickCount_ = 0;
     mock::sequence s;
-<<<<<<< HEAD
     MouseCoords mc1(5, 2);
     mc1.ldown = true;
     MouseCoords mc1_u(mc1.pos);
     MouseCoords mc2(10, 7);
     mc2.ldown = true;
-=======
-    MouseCoords mc1(5, 2, true);
-    MouseCoords mc1_u(mc1.pos);
-    MouseCoords mc2(10, 7, true);
->>>>>>> 9c0b20071 (Added tests for cfg envOverride and touch dblClick)
     MouseCoords mc2_u(mc2.pos);
     MOCK_EXPECT(dsk->Msg_LeftDown).once().with(mc1).in(s).returns(true);
     MOCK_EXPECT(dsk->Msg_LeftUp).once().with(mc1_u).in(s).returns(true);
@@ -105,17 +100,11 @@ BOOST_FIXTURE_TEST_CASE(DblClick, WMFixture)
 {
     video->tickCount_ = 0;
     mock::sequence s;
-<<<<<<< HEAD
     MouseCoords mc1(5, 2);
     mc1.ldown = true;
     MouseCoords mc1_u(mc1.pos);
     MouseCoords mc2(6, 1);
     mc2.ldown = true;
-=======
-    MouseCoords mc1(5, 2, true);
-    MouseCoords mc1_u(mc1.pos);
-    MouseCoords mc2(6, 1, true);
->>>>>>> 9c0b20071 (Added tests for cfg envOverride and touch dblClick)
     MouseCoords mc2_u(mc2.pos);
     // Click with time > DOUBLE_CLICK_INTERVAL is no dbl click
     MOCK_EXPECT(dsk->Msg_LeftDown).once().with(mc1).in(s).returns(true);
@@ -127,13 +116,9 @@ BOOST_FIXTURE_TEST_CASE(DblClick, WMFixture)
     MOCK_EXPECT(dsk->Msg_LeftUp).once().with(mc2_u).in(s).returns(true);
     // Click on same pos with time < DOUBLE_CLICK_INTERVAL is dbl click
     MOCK_EXPECT(dsk->Msg_LeftDown).once().with(mc2).in(s).returns(true);
-<<<<<<< HEAD
     MouseCoords dbl_mc2(mc2.pos);
     dbl_mc2.dbl_click = true;
     MOCK_EXPECT(dsk->Msg_LeftUp).once().with(dbl_mc2).in(s).returns(true);
-=======
-    MOCK_EXPECT(dsk->Msg_LeftUp).once().with(MouseCoords(mc2.pos, false, false, true)).in(s).returns(true);
->>>>>>> 9c0b20071 (Added tests for cfg envOverride and touch dblClick)
     // No triple click
     MOCK_EXPECT(dsk->Msg_LeftDown).once().with(mc2).in(s).returns(true);
     MOCK_EXPECT(dsk->Msg_LeftUp).once().with(mc2_u).in(s).returns(true);
@@ -166,14 +151,23 @@ BOOST_FIXTURE_TEST_CASE(DblClickTouch, WMFixture)
     video->numTfinger_ = 1;
     mock::sequence s;
 
-    MouseCoords mc1(5, 2, true, false, false, 1);
-    MouseCoords mc1_u(mc1.pos, false, false, false, 1);
+    MouseCoords mc1(5, 2);
+    mc1.ldown = true;
+    mc1.num_tfingers = 1;
+    MouseCoords mc1_u(mc1.pos);
+    mc1_u.num_tfingers = 1;
     // Test click on distance > TOUCH_MAX_DOUBLE_CLICK_DISTANCE
-    MouseCoords mc2(mc1.pos.x + TOUCH_MAX_DOUBLE_CLICK_DISTANCE + 1, mc1.pos.y, true, false, false, 1);
-    MouseCoords mc2_u(mc2.pos, false, false, false, 1);
+    MouseCoords mc2(mc1.pos.x + TOUCH_MAX_DOUBLE_CLICK_DISTANCE + 1, mc1.pos.y);
+    mc2.ldown = true;
+    mc2.num_tfingers = 1;
+    MouseCoords mc2_u(mc2.pos);
+    mc2_u.num_tfingers = 1;
     // Test click on distance < TOUCH_MAX_DOUBLE_CLICK_DISTANCE
-    MouseCoords mc3(mc2.pos.x + TOUCH_MAX_DOUBLE_CLICK_DISTANCE - 1, mc2.pos.y, true, false, false, 1);
-    MouseCoords mc3_u(mc3.pos, false, false, false, 1);
+    MouseCoords mc3(mc2.pos.x + TOUCH_MAX_DOUBLE_CLICK_DISTANCE - 1, mc2.pos.y);
+    mc3.ldown = true;
+    mc3.num_tfingers = 1;
+    MouseCoords mc3_u(mc3.pos);
+    mc3_u.num_tfingers = 1;
 
     // Set last click position on mc1
     MOCK_EXPECT(dsk->Msg_LeftDown).once().with(mc1).in(s).returns(true);
@@ -185,7 +179,10 @@ BOOST_FIXTURE_TEST_CASE(DblClickTouch, WMFixture)
 
     // Touch position mc3 -> In range of mc -> dblclick
     MOCK_EXPECT(dsk->Msg_LeftDown).once().with(mc3).in(s).returns(true);
-    MOCK_EXPECT(dsk->Msg_LeftUp).once().with(MouseCoords(mc3.pos, false, false, true, 1)).in(s).returns(true);
+    MouseCoords range_mc3(mc3.pos);
+    range_mc3.dbl_click = true;
+    range_mc3.num_tfingers = 1;
+    MOCK_EXPECT(dsk->Msg_LeftUp).once().with(range_mc3).in(s).returns(true);
 
     // Try to touch 3rd time -> no dblclick -> Set last click position to mc3
     MOCK_EXPECT(dsk->Msg_LeftDown).once().with(mc3).in(s).returns(true);

tests/s25Main/integration/testDskGameInterface.cpp

@@ -75,7 +75,9 @@ BOOST_FIXTURE_TEST_CASE(Scrolling, GameInterfaceFixture)
     SETTINGS.interface.mapScrollMode = MapScrollMode::ScrollOpposite;
 
     Position startPos(10, 15);
-    MouseCoords mouse(startPos, false, true);
+    //MouseCoords mouse(startPos, false, true);
+    MouseCoords mouse(startPos);
+    mouse.rdown = true;
 
     // Regular scrolling: Right down, 2 moves, right up
     {