# HG changeset patch # User peter1138 # Date 1183659713 0 # Node ID 07aab6ef7c5d8eb83f7b8a63f3b979cfd00636d7 # Parent fbc81130a14b5f3a319e713f968065ab37f9284b (svn r10450) -Fix (r10444): Fix search & replace errors diff -r fbc81130a14b -r 07aab6ef7c5d src/video/cocoa_v.mm --- a/src/video/cocoa_v.mm Thu Jul 05 16:40:19 2007 +0000 +++ b/src/video/cocoa_v.mm Thu Jul 05 18:21:53 2007 +0000 @@ -139,7 +139,7 @@ static OTTDMain *_ottd_main; -static struct VideoDriver_Cocoa::Data { +static struct CocoaVideoData { bool isset; bool issetting; @@ -1320,9 +1320,9 @@ 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; CFNumberRef number; int bpp; @@ -1708,7 +1708,7 @@ _cocoa_video_data.issetting = true; if (fullscreen) { /* Setup full screen video */ - ret = QZ_SetVideoToggleFullscreen(width, height); + ret = QZ_SetVideoFullScreen(width, height); } else { /* Setup windowed video */ ret = QZ_SetVideoWindowed(width, height); @@ -2001,7 +2001,7 @@ QZ_VideoInit(); ret = QZ_SetVideoMode(_cur_resolution[0], _cur_resolution[1], _fullscreen); - if (ret != NULL) VideoDriver_Cocoa::Stop(); + if (ret != NULL) _video_driver->Stop(); return ret; } @@ -2052,14 +2052,14 @@ _cocoa_video_dialog = true; 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); return; } 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; }