Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r10450) -Fix (r10444): Fix search & replace errors

Browse Source
This commit is contained in:
peter1138 2007-07-05 18:21:53 +00:00
parent ca88ccb623
commit 191a479e8d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/video/cocoa_v.mm
View File

@ -139,7 +139,7 @@ static NSAutoreleasePool *_ottd_autorelease_pool;
static OTTDMain *_ottd_main; static OTTDMain *_ottd_main;
static struct VideoDriver_Cocoa::Data { static struct CocoaVideoData {
bool isset; bool isset;
bool issetting; bool issetting;
@ -1320,9 +1320,9 @@ static uint32 QZ_FadeGammaIn(const OTTD_QuartzGammaTable* table)
return 0; return 0;
} }
static const char* QZ_SetVideoToggleFullscreen(int width, int height) static const char* QZ_SetVideoFullScreen(int width, int height)
{ {
const char* errstr = "QZ_SetVideoToggleFullscreen error"; const char* errstr = "QZ_SetVideoFullScreen error";
int exact_match; int exact_match;
CFNumberRef number; CFNumberRef number;
int bpp; int bpp;
@ -1708,7 +1708,7 @@ static const char* QZ_SetVideoMode(uint width, uint height, bool fullscreen)
_cocoa_video_data.issetting = true; _cocoa_video_data.issetting = true;
if (fullscreen) { if (fullscreen) {
/* Setup full screen video */ /* Setup full screen video */
ret = QZ_SetVideoToggleFullscreen(width, height); ret = QZ_SetVideoFullScreen(width, height);
} else { } else {
/* Setup windowed video */ /* Setup windowed video */
ret = QZ_SetVideoWindowed(width, height); ret = QZ_SetVideoWindowed(width, height);
@ -2001,7 +2001,7 @@ const char *VideoDriver_Cocoa::Start(const char * const *parm)
QZ_VideoInit(); QZ_VideoInit();
ret = QZ_SetVideoMode(_cur_resolution[0], _cur_resolution[1], _fullscreen); ret = QZ_SetVideoMode(_cur_resolution[0], _cur_resolution[1], _fullscreen);
if (ret != NULL) VideoDriver_Cocoa::Stop(); if (ret != NULL) _video_driver->Stop();
return ret; return ret;
} }
@ -2052,14 +2052,14 @@ void CocoaDialog(const char* title, const char* message, const char* buttonLabel
_cocoa_video_dialog = true; _cocoa_video_dialog = true;
wasstarted = _cocoa_video_started; wasstarted = _cocoa_video_started;
if (!_cocoa_video_started && VideoDriver_Cocoa::Start(NULL) != NULL) { if (!_cocoa_video_started && _video_driver->Start(NULL) != NULL) {
fprintf(stderr, "%s: %s\n", title, message); fprintf(stderr, "%s: %s\n", title, message);
return; return;
} }
NSRunAlertPanel([NSString stringWithCString: title], [NSString stringWithCString: message], [NSString stringWithCString: buttonLabel], nil, nil); NSRunAlertPanel([NSString stringWithCString: title], [NSString stringWithCString: message], [NSString stringWithCString: buttonLabel], nil, nil);
if (!wasstarted) VideoDriver_Cocoa::Stop(); if (!wasstarted) _video_driver->Stop();
_cocoa_video_dialog = false; _cocoa_video_dialog = false;
} }