dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r26538) -Codechange: remove double accounting of the drivers

Browse Source
This commit is contained in:
rubidium
2014-04-28 21:06:51 +00:00
parent 3b634b628c
commit b476086c39
24 changed files with 97 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/video/cocoa/cocoa_v.mm
View File

@@ -597,16 +597,16 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel
_cocoa_video_dialog = true;
bool wasstarted = _cocoa_video_started;
if (_video_driver == NULL) {
if (VideoDriver::GetInstance() == NULL) {
setupApplication(); // Setup application before showing dialog
} else if (!_cocoa_video_started && _video_driver->Start(NULL) != NULL) {
} else if (!_cocoa_video_started && VideoDriver::GetInstance()->Start(NULL) != NULL) {
fprintf(stderr, "%s: %s\n", title, message);
return;
}
NSRunAlertPanel([ NSString stringWithUTF8String:title ], [ NSString stringWithUTF8String:message ], [ NSString stringWithUTF8String:buttonLabel ], nil, nil);
if (!wasstarted && _video_driver != NULL) _video_driver->Stop();
if (!wasstarted && VideoDriver::GetInstance() != NULL) VideoDriver::GetInstance()->Stop();
_cocoa_video_dialog = false;
}

2
src/video/cocoa/event.mm
View File

@@ -287,7 +287,7 @@ static bool QZ_KeyEvent(unsigned short keycode, unsigned short unicode, BOOL dow
case QZ_RETURN:
case QZ_f:
if (down && (_current_mods & NSCommandKeyMask)) {
_video_driver->ToggleFullscreen(!_fullscreen);
VideoDriver::GetInstance()->ToggleFullscreen(!_fullscreen);
}
break;
}