summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-09-13 01:20:36 +0300
committerAndrei Karas <akaras@inbox.ru>2017-09-13 01:20:36 +0300
commit1f71a98b9377324bb08ba20fbfe52cbff67c49c9 (patch)
tree1d3a2f14b830f48d4f8e1a160904ca4a44d9042d /src
parent1156b6cc3d2a83e8f3bd87b3e4e9b699825e526d (diff)
downloadmanaverse-1f71a98b9377324bb08ba20fbfe52cbff67c49c9.tar.gz
manaverse-1f71a98b9377324bb08ba20fbfe52cbff67c49c9.tar.bz2
manaverse-1f71a98b9377324bb08ba20fbfe52cbff67c49c9.tar.xz
manaverse-1f71a98b9377324bb08ba20fbfe52cbff67c49c9.zip
Fix unit tests compilation with SDL 1.2.
Diffstat (limited to 'src')
-rw-r--r--src/unittests/gui/windowmanager.cc18
-rw-r--r--src/unittests/render/mockgraphics.cc5
2 files changed, 19 insertions, 4 deletions
diff --git a/src/unittests/gui/windowmanager.cc b/src/unittests/gui/windowmanager.cc
index bed0de6a1..c83f47480 100644
--- a/src/unittests/gui/windowmanager.cc
+++ b/src/unittests/gui/windowmanager.cc
@@ -200,7 +200,14 @@ TEST_CASE("Windows tests", "windowmanager")
TranslationManager::init();
- mainGraphics->setVideoMode(640, 480, 1, 8, false, false, false, false);
+ mainGraphics->setVideoMode(640, 480,
+ 1,
+ 8,
+ false,
+ false,
+ false,
+ false,
+ false);
SECTION("bankWindow")
{
@@ -879,7 +886,14 @@ TEST_CASE("WindowManager", "create windows")
TranslationManager::init();
- mainGraphics->setVideoMode(640, 480, 1, 8, false, false, false, false);
+ mainGraphics->setVideoMode(640, 480,
+ 1,
+ 8,
+ false,
+ false,
+ false,
+ false,
+ false);
SECTION("create windows")
{
diff --git a/src/unittests/render/mockgraphics.cc b/src/unittests/render/mockgraphics.cc
index b484ad4d1..29aa19af6 100644
--- a/src/unittests/render/mockgraphics.cc
+++ b/src/unittests/render/mockgraphics.cc
@@ -263,9 +263,10 @@ bool MockGraphics::setVideoMode(const int w, const int h,
const bool fs,
const bool hwaccel,
const bool resize,
- const bool noFrame) restrict2
+ const bool noFrame,
+ const bool allowHighDPI) restrict2
{
- setMainFlags(w, h, scale, bpp, fs, hwaccel, resize, noFrame);
+ setMainFlags(w, h, scale, bpp, fs, hwaccel, resize, noFrame, allowHighDPI);
if ((mWindow = graphicsManager.createWindow(w, h, bpp,
getSoftwareFlags())) == nullptr)