summaryrefslogtreecommitdiff
path: root/src/progs/manaplus
diff options
context:
space:
mode:
Diffstat (limited to 'src/progs/manaplus')
-rw-r--r--src/progs/manaplus/actions/actions.cpp9
-rw-r--r--src/progs/manaplus/client.cpp7
2 files changed, 9 insertions, 7 deletions
diff --git a/src/progs/manaplus/actions/actions.cpp b/src/progs/manaplus/actions/actions.cpp
index c367b01ee..6f9bf56b9 100644
--- a/src/progs/manaplus/actions/actions.cpp
+++ b/src/progs/manaplus/actions/actions.cpp
@@ -1528,11 +1528,12 @@ impHandler(dumpTests)
impHandler0(dumpOGL)
{
-#if defined(USE_OPENGL) && !defined(ANDROID) && !defined(__native_client__) \
- && !defined(__SWITCH__)
+#ifdef USE_OPENGL
+#if !defined(ANDROID) && !defined(__native_client__) && !defined(__SWITCH__)
NormalOpenGLGraphics::dumpSettings();
-#endif // defined(USE_OPENGL) && !defined(ANDROID) &&
- // !defined(__native_client__)
+#endif // !defined(ANDROID) && !defined(__native_client__) &&
+ // !defined(__SWITCH__)
+#endif // USE_OPENGL
return true;
}
diff --git a/src/progs/manaplus/client.cpp b/src/progs/manaplus/client.cpp
index 8670ae4ab..0fb971c61 100644
--- a/src/progs/manaplus/client.cpp
+++ b/src/progs/manaplus/client.cpp
@@ -411,8 +411,8 @@ void Client::gameInit()
Cpu::detect();
DyePalette::initFunctions();
#if defined(USE_OPENGL)
-#if !defined(ANDROID) && !defined(__APPLE__) && \
- !defined(__native_client__) && !defined(__SWITCH__) && !defined(UNITTESTS)
+#if !defined(ANDROID) && !defined(__APPLE__)
+#if !defined(__native_client__) && !defined(__SWITCH__) && !defined(UNITTESTS)
if (!settings.options.safeMode &&
settings.options.renderer < 0 &&
settings.options.test.empty() &&
@@ -421,8 +421,9 @@ void Client::gameInit()
{
graphicsManager.detectVideoSettings();
}
+#endif // !defined(__native_client__) && !defined(__SWITCH__) &&
+ // !defined(UNITTESTS)
#endif // !defined(ANDROID) && !defined(__APPLE__) &&
- // !defined(__native_client__) && !defined(UNITTESTS)
#endif // defined(USE_OPENGL)
initGraphics();