diff options
author | bjarni <bjarni@openttd.org> | 2006-03-18 16:11:29 +0000 |
---|---|---|
committer | bjarni <bjarni@openttd.org> | 2006-03-18 16:11:29 +0000 |
commit | a6b3a519d9986e59a0669f1b52ed8517cf2f91fa (patch) | |
tree | a32cc21f7c444e9c284b22893656d72ed2ea2213 /video/cocoa_v.m | |
parent | 556e144628280a3afc87fe567c2f8ebb7b126213 (diff) | |
download | openttd-a6b3a519d9986e59a0669f1b52ed8517cf2f91fa.tar.xz |
(svn r3971) reverted r3742 as those new errors were not the right way to handle those exceptions
Diffstat (limited to 'video/cocoa_v.m')
-rw-r--r-- | video/cocoa_v.m | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/video/cocoa_v.m b/video/cocoa_v.m index e8c18895c..71065cd25 100644 --- a/video/cocoa_v.m +++ b/video/cocoa_v.m @@ -847,10 +847,6 @@ static void QZ_SetPortAlphaOpaque(void) _cocoa_video_data.realpixels = GetPixBaseAddr(GetPortPixMap(thePort)); _cocoa_video_data.pitch = GetPixRowBytes(GetPortPixMap(thePort)); - if (_cocoa_video_data.realpixels == NULL) { - ShowMacErrorDialog("Error: failure to locate screen buffer in the OS"); - } - /* _cocoa_video_data.realpixels now points to the window's pixels * We want it to point to the *view's* pixels */ @@ -866,9 +862,7 @@ static void QZ_SetPortAlphaOpaque(void) /* Allocate new buffer */ free(_cocoa_video_data.pixels); _cocoa_video_data.pixels = (uint8*)malloc(newViewFrame.size.width * newViewFrame.size.height); - if (_cocoa_video_data.pixels == NULL) { - ShowMacErrorDialog("Error: failed to allocate frame buffer"); - } + assert(_cocoa_video_data.pixels != NULL); /* Tell the game that the resolution changed */ @@ -1358,10 +1352,6 @@ static const char* QZ_SetVideoFullScreen(int width, int height) _cocoa_video_data.realpixels = (uint8*)CGDisplayBaseAddress(_cocoa_video_data.display_id); _cocoa_video_data.pitch = CGDisplayBytesPerRow(_cocoa_video_data.display_id); - if (_cocoa_video_data.realpixels == NULL ) { - ShowMacErrorDialog("Error: failure to locate screen buffer in the OS for full screen mode"); - } - _cocoa_video_data.width = CGDisplayPixelsWide(_cocoa_video_data.display_id); _cocoa_video_data.height = CGDisplayPixelsHigh(_cocoa_video_data.display_id); _cocoa_video_data.fullscreen = true; |