cpp/openttd-patchpack/source Changeset - r7176:97b7675a2ff1

Changeset - r7176:97b7675a2ff1

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

peter1138 - 17 years ago 2007-07-05 18:21:53
peter1138@openttd.org

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

1 file changed with 7 insertions and 7 deletions:

src/video/cocoa_v.mm

0 comments (0 inline, 0 general)

src/video/cocoa_v.mm

➞

Show inline comments

@@ @@ -139,7 +139,7 @@ static NSAutoreleasePool *_ottd_autorele @@
 static OTTDMain *_ottd_main;
-static struct VideoDriver_Cocoa::Data {
+static struct CocoaVideoData {
 	bool isset;
 	bool issetting;
@@ @@ -1320,9 +1320,9 @@ static uint32 QZ_FadeGammaIn(const OTTD_ @@
 	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 @@ static const char* QZ_SetVideoMode(uint @@
 	_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 @@ const char *VideoDriver_Cocoa::Start(con @@
 	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 @@ void CocoaDialog(const char* title, cons @@
 	_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;
+}

0 comments (0 inline, 0 general)