summaryrefslogtreecommitdiff
path: root/src/setup/display.c
diff options
context:
space:
mode:
authorSimon Howard2013-10-26 21:26:56 +0000
committerSimon Howard2013-10-26 21:26:56 +0000
commit14d3126d2fa295df43878c0ce45be37d36eb09c2 (patch)
treed47d26087b1c68c9bd3a8837ab1c01ae6360f41e /src/setup/display.c
parent2d6b1a9263855eb78d5dcd35feeab36bb4c1f0f9 (diff)
downloadchocolate-doom-14d3126d2fa295df43878c0ce45be37d36eb09c2.tar.gz
chocolate-doom-14d3126d2fa295df43878c0ce45be37d36eb09c2.tar.bz2
chocolate-doom-14d3126d2fa295df43878c0ce45be37d36eb09c2.zip
Default to windowed mode in OS X, as there is an SDL bug that can cause
crashing in fullscreen mode (thanks Ryan Peel). Subversion-branch: /branches/v2-branch Subversion-revision: 2721
Diffstat (limited to 'src/setup/display.c')
-rw-r--r--src/setup/display.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/setup/display.c b/src/setup/display.c
index 4fd4f3b7..494d732a 100644
--- a/src/setup/display.c
+++ b/src/setup/display.c
@@ -743,4 +743,13 @@ void BindDisplayVariables(void)
}
}
#endif
+
+ // Disable fullscreen by default on OS X, as there is an SDL bug
+ // where some old versions of OS X (<= Snow Leopard) crash.
+
+#ifdef __MACOSX__
+ fullscreen = 0;
+ screen_width = 800;
+ screen_height = 600;
+#endif
}