mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r17768) -Fix (r17715): [OSX] Newer GCC versions don't like jumping over variable definitions with goto's. (planetmaker)

release/1.0
michi_cc 2009-10-12 00:19:11 +00:00
parent 53ce152c7e
commit 2b7e242872
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/video/cocoa/fullscreen.mm
View File

@ -257,6 +257,12 @@ class FullscreenSubdriver: public CocoaSubdriver {
bool SetVideoMode(int w, int h) bool SetVideoMode(int w, int h)
{ {
/* Define this variables at the top (against coding style) because
* otherwise GCC barfs at the goto's jumping over variable initialization. */
NSRect screen_rect;
NSPoint pt;
int gamma_error;
/* Destroy any previous mode */ /* Destroy any previous mode */
if (this->pixel_buffer != NULL) { if (this->pixel_buffer != NULL) {
free(this->pixel_buffer); free(this->pixel_buffer);
@ -286,7 +292,7 @@ class FullscreenSubdriver: public CocoaSubdriver {
/* Fade display to zero gamma */ /* Fade display to zero gamma */
OTTD_QuartzGammaTable gamma_table; OTTD_QuartzGammaTable gamma_table;
int gamma_error = this->FadeGammaOut(&gamma_table); gamma_error = this->FadeGammaOut(&gamma_table);
/* Put up the blanking window (a window above all other windows) */ /* Put up the blanking window (a window above all other windows) */
if (CGDisplayCapture(this->display_id) != CGDisplayNoErr ) { if (CGDisplayCapture(this->display_id) != CGDisplayNoErr ) {
@ -330,11 +336,10 @@ class FullscreenSubdriver: public CocoaSubdriver {
* We can hack around this bug by setting the screen rect ourselves. * We can hack around this bug by setting the screen rect ourselves.
* This hack should be removed if/when the bug is fixed. * This hack should be removed if/when the bug is fixed.
*/ */
NSRect screen_rect = NSMakeRect(0, 0, this->display_width, this->display_height); screen_rect = NSMakeRect(0, 0, this->display_width, this->display_height);
[ [ NSScreen mainScreen ] setFrame:screen_rect ]; [ [ NSScreen mainScreen ] setFrame:screen_rect ];
pt = [ NSEvent mouseLocation ];
NSPoint pt = [ NSEvent mouseLocation ];
pt.y = this->display_height - pt.y; pt.y = this->display_height - pt.y;
if (this->MouseIsInsideView(&pt)) QZ_HideMouse(); if (this->MouseIsInsideView(&pt)) QZ_HideMouse();