diff options
| author | David Athay <ko2fan@gmail.com> | 2008-12-31 16:22:56 +0000 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2008-12-31 16:22:56 +0000 |
| commit | d7a5438d3c7b140c0966243bae98ff447385d246 (patch) | |
| tree | 7c8666ba7c670b1a1b787144ff1b2df0ad4387b0 | |
| parent | 69dddef124d870a874b544e478d4c19616fe8370 (diff) | |
| download | mana-client-d7a5438d3c7b140c0966243bae98ff447385d246.tar.gz mana-client-d7a5438d3c7b140c0966243bae98ff447385d246.tar.bz2 mana-client-d7a5438d3c7b140c0966243bae98ff447385d246.tar.xz mana-client-d7a5438d3c7b140c0966243bae98ff447385d246.zip | |
Fixed OSX fullscreen hang
| -rw-r--r-- | LICENSE.rtf | 15 | ||||
| -rw-r--r-- | src/gui/setup_video.cpp | 4 |
2 files changed, 2 insertions, 17 deletions
diff --git a/LICENSE.rtf b/LICENSE.rtf deleted file mode 100644 index 2592d38a..00000000 --- a/LICENSE.rtf +++ /dev/null @@ -1,15 +0,0 @@ -{\rtf1\ansi\ansicpg1252\cocoartf949 -{\fonttbl\f0\fswiss\fcharset0 Helvetica;} -{\colortbl;\red255\green255\blue255;} -\paperw11900\paperh16840\margl1440\margr1440\vieww9480\viewh8400\viewkind0 -\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural - -\f0\fs24 \cf0 The Mana World is released under the GPL - more info at www.themanaworld.org\ -\ -SDL is used under the LGPL - more info at www.libsdl.org\ -\ -SDL_image, SDL_ttf, SDL_mixer and SDL_net are used under the LGPL - more info at www.libsdl.org/libs\ -\ -physfs is used under the BSD license - more info at http://icculus.org/physfs/\ -\ -zlib is used under the BSD license - more info at www.zlib.net}
\ No newline at end of file diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 54169b63..23d2d9c2 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -285,7 +285,7 @@ void Setup_Video::apply() * See http://libsdl.org/cgi/docwiki.cgi/SDL_SetVideoMode */ -#ifdef WIN32 +#if defined(WIN32) || defined(__APPLE__) // checks for opengl usage if (!(config.getValue("opengl", 0) == 1)) { @@ -303,7 +303,7 @@ void Setup_Video::apply() logger->error(error.str()); } } -#ifdef WIN32 +#if defined(WIN32) || defined(__APPLE__) } else { new OkDialog("Switching to full screen", "Restart needed for changes to take effect."); |