(svn r23446) -Codechange: move _cur_palette and it's related first/count dirty variables into a single structure

1 files changed, 13 insertions, 13 deletions

diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp
index f571638b8..5cd9f64da 100644
--- a/src/video/win32_v.cpp
+++ b/src/video/win32_v.cpp
@@ -56,9 +56,9 @@ static void MakePalette()
 	pal->palNumEntries = 256;
 
 	for (i = 0; i != 256; i++) {
-		pal->palPalEntry[i].peRed   = _cur_palette[i].r;
-		pal->palPalEntry[i].peGreen = _cur_palette[i].g;
-		pal->palPalEntry[i].peBlue  = _cur_palette[i].b;
+		pal->palPalEntry[i].peRed   = _cur_palette.palette[i].r;
+		pal->palPalEntry[i].peGreen = _cur_palette.palette[i].g;
+		pal->palPalEntry[i].peBlue  = _cur_palette.palette[i].b;
 		pal->palPalEntry[i].peFlags = 0;
 
 	}
@@ -72,9 +72,9 @@ static void UpdatePalette(HDC dc, uint start, uint count)
 	uint i;
 
 	for (i = 0; i != count; i++) {
-		rgb[i].rgbRed   = _cur_palette[start + i].r;
-		rgb[i].rgbGreen = _cur_palette[start + i].g;
-		rgb[i].rgbBlue  = _cur_palette[start + i].b;
+		rgb[i].rgbRed   = _cur_palette.palette[start + i].r;
+		rgb[i].rgbGreen = _cur_palette.palette[start + i].g;
+		rgb[i].rgbBlue  = _cur_palette.palette[start + i].b;
 		rgb[i].rgbReserved = 0;
 	}
 
@@ -162,8 +162,8 @@ static void ClientSizeChanged(int w, int h)
 	/* allocate new dib section of the new size */
 	if (AllocateDibSection(w, h)) {
 		/* mark all palette colors dirty */
-		_pal_first_dirty = 0;
-		_pal_count_dirty = 256;
+		_cur_palette.first_dirty = 0;
+		_cur_palette.count_dirty = 256;
 
 		BlitterFactoryBase::GetCurrentBlitter()->PostResize();
 
@@ -350,16 +350,16 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 			old_bmp = (HBITMAP)SelectObject(dc2, _wnd.dib_sect);
 			old_palette = SelectPalette(dc, _wnd.gdi_palette, FALSE);
 
-			if (_pal_count_dirty != 0) {
+			if (_cur_palette.count_dirty != 0) {
 				Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter();
 
 				switch (blitter->UsePaletteAnimation()) {
 					case Blitter::PALETTE_ANIMATION_VIDEO_BACKEND:
-						UpdatePalette(dc2, _pal_first_dirty, _pal_count_dirty);
+						UpdatePalette(dc2, _cur_palette.first_dirty, _cur_palette.count_dirty);
 						break;
 
 					case Blitter::PALETTE_ANIMATION_BLITTER:
-						blitter->PaletteAnimate(_pal_first_dirty, _pal_count_dirty);
+						blitter->PaletteAnimate(_cur_palette.first_dirty, _cur_palette.count_dirty);
 						break;
 
 					case Blitter::PALETTE_ANIMATION_NONE:
@@ -368,7 +368,7 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 					default:
 						NOT_REACHED();
 				}
-				_pal_count_dirty = 0;
+				_cur_palette.count_dirty = 0;
 			}
 
 			BitBlt(dc, 0, 0, _wnd.width, _wnd.height, dc2, 0, 0, SRCCOPY);
@@ -839,7 +839,7 @@ void VideoDriver_Win32::MakeDirty(int left, int top, int width, int height)
 
 static void CheckPaletteAnim()
 {
-	if (_pal_count_dirty == 0) return;
+	if (_cur_palette.count_dirty == 0) return;
 
 	InvalidateRect(_wnd.main_wnd, NULL, FALSE);
 }