Changeset - r13993:05fba9b1b249
[Not reviewed]
master
0 6 0
frosch - 15 years ago 2009-12-19 18:46:40
frosch@openttd.org
(svn r18545) -Fix [FS#3292]: Assign '_screen.dst_ptr' as soon as it is allocated.
6 files changed with 6 insertions and 11 deletions:
0 comments (0 inline, 0 general)
src/video/allegro_v.cpp
Show inline comments
 
@@ -211,9 +211,10 @@ static bool CreateMainSurface(uint w, ui
 
	_screen.width = _allegro_screen->w;
 
	_screen.height = _allegro_screen->h;
 
	_screen.pitch = ((byte*)screen->line[1] - (byte*)screen->line[0]) / (bpp / 8);
 
	_screen.dst_ptr = _allegro_screen->line[0];
 

	
 
	/* Initialise the screen so we don't blit garbage to the screen */
 
	memset(_allegro_screen->line[0], 0, _screen.height * _screen.pitch);
 
	memset(_screen.dst_ptr, 0, _screen.height * _screen.pitch);
 

	
 
	/* Set the mouse at the place where we expect it */
 
	poll_mouse();
 
@@ -520,7 +521,6 @@ void VideoDriver_Allegro::MainLoop()
 

	
 
			GameLoop();
 

	
 
			_screen.dst_ptr = _allegro_screen->line[0];
 
			UpdateWindows();
 
			if (++pal_tick > 4) {
 
				CheckPaletteAnim();
 
@@ -529,7 +529,6 @@ void VideoDriver_Allegro::MainLoop()
 
			DrawSurfaceToScreen();
 
		} else {
 
			CSleep(1);
 
			_screen.dst_ptr = _allegro_screen->line[0];
 
			NetworkDrawChatMessage();
 
			DrawMouseCursor();
 
			DrawSurfaceToScreen();
src/video/cocoa/cocoa_v.mm
Show inline comments
 
@@ -194,6 +194,7 @@ void QZ_GameSizeChanged()
 
	_screen.width = _cocoa_subdriver->GetWidth();
 
	_screen.height = _cocoa_subdriver->GetHeight();
 
	_screen.pitch = _cocoa_subdriver->GetWidth();
 
	_screen.dst_ptr = _cocoa_subdriver->GetPixelBuffer();
 
	_fullscreen = _cocoa_subdriver->IsFullscreen();
 

	
 
	GameSizeChanged();
src/video/cocoa/event.mm
Show inline comments
 
@@ -603,7 +603,6 @@ void QZ_GameLoop()
 
	uint32 st = 0;
 
#endif
 

	
 
	_screen.dst_ptr = _cocoa_subdriver->GetPixelBuffer();
 
	DisplaySplashImage();
 
	QZ_CheckPaletteAnim();
 
	_cocoa_subdriver->Draw(true);
 
@@ -611,7 +610,6 @@ void QZ_GameLoop()
 

	
 
	for (int i = 0; i < 2; i++) GameLoop();
 

	
 
	_screen.dst_ptr = _cocoa_subdriver->GetPixelBuffer();
 
	UpdateWindows();
 
	QZ_CheckPaletteAnim();
 
	_cocoa_subdriver->Draw();
 
@@ -651,7 +649,6 @@ void QZ_GameLoop()
 

	
 
			GameLoop();
 

	
 
			_screen.dst_ptr = _cocoa_subdriver->GetPixelBuffer();
 
			UpdateWindows();
 
			if (++pal_tick > 4) {
 
				QZ_CheckPaletteAnim();
 
@@ -666,7 +663,6 @@ void QZ_GameLoop()
 
#ifdef _DEBUG
 
			st += GetTick() - st0;
 
#endif
 
			_screen.dst_ptr = _cocoa_subdriver->GetPixelBuffer();
 
			NetworkDrawChatMessage();
 
			DrawMouseCursor();
 
			_cocoa_subdriver->Draw();
src/video/dedicated_v.cpp
Show inline comments
 
@@ -145,6 +145,7 @@ const char *VideoDriver_Dedicated::Start
 

	
 
	_screen.width  = _screen.pitch = _cur_resolution.width;
 
	_screen.height = _cur_resolution.height;
 
	_screen.dst_ptr = _dedicated_video_mem;
 
	ScreenSizeChanged();
 

	
 
#if defined(WINCE)
 
@@ -302,7 +303,6 @@ void VideoDriver_Dedicated::MainLoop()
 
			next_tick = cur_ticks + 30;
 

	
 
			GameLoop();
 
			_screen.dst_ptr = _dedicated_video_mem;
 
			UpdateWindows();
 
		}
 
		CSleep(1);
src/video/null_v.cpp
Show inline comments
 
@@ -21,6 +21,7 @@ const char *VideoDriver_Null::Start(cons
 
	this->ticks = GetDriverParamInt(parm, "ticks", 1000);
 
	_screen.width  = _screen.pitch = _cur_resolution.width;
 
	_screen.height = _cur_resolution.height;
 
	_screen.dst_ptr = NULL;
 
	ScreenSizeChanged();
 

	
 
	/* Do not render, nor blit */
 
@@ -39,7 +40,6 @@ void VideoDriver_Null::MainLoop()
 

	
 
	for (i = 0; i < this->ticks; i++) {
 
		GameLoop();
 
		_screen.dst_ptr = NULL;
 
		UpdateWindows();
 
	}
 
}
src/video/sdl_v.cpp
Show inline comments
 
@@ -249,6 +249,7 @@ static bool CreateMainSurface(uint w, ui
 
	_screen.width = newscreen->w;
 
	_screen.height = newscreen->h;
 
	_screen.pitch = newscreen->pitch / (bpp / 8);
 
	_screen.dst_ptr = newscreen->pixels;
 
	_sdl_screen = newscreen;
 
	InitPalette();
 

	
 
@@ -587,7 +588,6 @@ void VideoDriver_SDL::MainLoop()
 

	
 
			if (_draw_threaded) _draw_mutex->BeginCritical();
 

	
 
			_screen.dst_ptr = _sdl_screen->pixels;
 
			UpdateWindows();
 
			if (++pal_tick > 4) {
 
				CheckPaletteAnim();
 
@@ -599,7 +599,6 @@ void VideoDriver_SDL::MainLoop()
 
			CSleep(1);
 
			if (_draw_threaded) _draw_mutex->BeginCritical();
 

	
 
			_screen.dst_ptr = _sdl_screen->pixels;
 
			NetworkDrawChatMessage();
 
			DrawMouseCursor();
 
		}
0 comments (0 inline, 0 general)