gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 07:29:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r10124) -Fix r10123: fix the OSX video driver properly

Browse Source
This commit is contained in:
truelight 2007-06-12 23:10:47 +00:00
parent ee4208ffe9
commit 2f5c49abc2
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/video/cocoa_v.mm
View File

@ -873,9 +873,6 @@ static void QZ_SetPortAlphaOpaque()
_screen.width = _cocoa_video_data.width; _screen.width = _cocoa_video_data.width;
_screen.height = _cocoa_video_data.height; _screen.height = _cocoa_video_data.height;
_screen.pitch = _cocoa_video_data.width; _screen.pitch = _cocoa_video_data.width;
_screen.renderer = RendererFactoryBase::SelectRenderer(BlitterFactoryBase::GetCurrentBlitter()->GetRenderer());
if (_screen.renderer == NULL) error("Couldn't load the renderer '%s' the selected blitter depends on", BlitterFactoryBase::GetCurrentBlitter()->GetRenderer());
GameSizeChanged(); GameSizeChanged();
@ -1711,9 +1708,6 @@ static const char* QZ_SetVideoMode(uint width, uint height, bool fullscreen)
_screen.width = _cocoa_video_data.width; _screen.width = _cocoa_video_data.width;
_screen.height = _cocoa_video_data.height; _screen.height = _cocoa_video_data.height;
_screen.pitch = _cocoa_video_data.width; _screen.pitch = _cocoa_video_data.width;
_screen.renderer = RendererFactoryBase::SelectRenderer(BlitterFactoryBase::GetCurrentBlitter()->GetRenderer());
if (_screen.renderer == NULL) error("Couldn't load the renderer '%s' the selected blitter depends on", BlitterFactoryBase::GetCurrentBlitter()->GetRenderer());
QZ_UpdateVideoModes(); QZ_UpdateVideoModes();
GameSizeChanged(); GameSizeChanged();
@ -1739,6 +1733,8 @@ static const char* QZ_SetVideoModeAndRestoreOnFailure(uint width, uint height, b
static void QZ_VideoInit() static void QZ_VideoInit()
{ {
if (BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth() == 0) error("Can't use a blitter that blits 0 bpp for normal visuals");
memset(&_cocoa_video_data, 0, sizeof(_cocoa_video_data)); memset(&_cocoa_video_data, 0, sizeof(_cocoa_video_data));
/* Initialize the video settings; this data persists between mode switches */ /* Initialize the video settings; this data persists between mode switches */
@ -1766,6 +1762,9 @@ static void QZ_VideoInit()
_cocoa_video_data.cursor_visible = true; _cocoa_video_data.cursor_visible = true;
_screen.renderer = RendererFactoryBase::SelectRenderer(BlitterFactoryBase::GetCurrentBlitter()->GetRenderer());
if (_screen.renderer == NULL) error("Couldn't load the renderer '%s' the selected blitter depends on", BlitterFactoryBase::GetCurrentBlitter()->GetRenderer());
/* register for sleep notifications so wake from sleep generates SDL_VIDEOEXPOSE */ /* register for sleep notifications so wake from sleep generates SDL_VIDEOEXPOSE */
// QZ_RegisterForSleepNotifications(); // QZ_RegisterForSleepNotifications();
} }