Changeset - r3261:38e474e8bbb0
[Not reviewed]
master
0 1 0
bjarni - 19 years ago 2006-03-18 16:11:29
bjarni@openttd.org
(svn r3971) reverted r3742 as those new errors were not the right way to handle those exceptions
1 file changed with 1 insertions and 11 deletions:
0 comments (0 inline, 0 general)
video/cocoa_v.m
Show inline comments
 
@@ -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
 
	_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;
0 comments (0 inline, 0 general)