diff options
author | planetmaker <planetmaker@openttd.org> | 2011-09-11 12:52:44 +0000 |
---|---|---|
committer | planetmaker <planetmaker@openttd.org> | 2011-09-11 12:52:44 +0000 |
commit | 58f00d786c11b2a5666dc5629d2b9445a8f3d1d1 (patch) | |
tree | 904673336f0518e0b07ce9da334d9dcdcfb351f0 /src/video/cocoa/fullscreen.mm | |
parent | 40d5419cd209cd84e2ff28a0585bc4ec44688981 (diff) | |
download | openttd-58f00d786c11b2a5666dc5629d2b9445a8f3d1d1.tar.xz |
(svn r22921) -Fix: [OSX] Don't allow the old fullscreen mode also not as fallback on OSX 10.7. Also add a few sprinkles of coding style accross cocoa display drivers
Diffstat (limited to 'src/video/cocoa/fullscreen.mm')
-rw-r--r-- | src/video/cocoa/fullscreen.mm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/video/cocoa/fullscreen.mm b/src/video/cocoa/fullscreen.mm index 56bcc580d..6eea3d64b 100644 --- a/src/video/cocoa/fullscreen.mm +++ b/src/video/cocoa/fullscreen.mm @@ -311,15 +311,15 @@ class FullscreenSubdriver: public CocoaSubdriver { /* Since CGDisplayBaseAddress and CGDisplayBytesPerRow are no longer available on 10.7, * disable until a replacement can be found. */ - if (MacOSVersionIsAtLeast(10, 7, 0)) { - this->window_buffer = NULL; - this->window_pitch = NULL; - } else { + if (MacOSVersionIsAtLeast(10, 7, 0)) { + this->window_buffer = NULL; + this->window_pitch = NULL; + } else { #if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7) - this->window_buffer = CGDisplayBaseAddress(this->display_id); - this->window_pitch = CGDisplayBytesPerRow(this->display_id); + this->window_buffer = CGDisplayBaseAddress(this->display_id); + this->window_pitch = CGDisplayBytesPerRow(this->display_id); #endif - } + } this->device_width = CGDisplayPixelsWide(this->display_id); this->device_height = CGDisplayPixelsHigh(this->display_id); |