From 67c9329cbe0bf5098cd2ed57ceda8fc270c3b93a Mon Sep 17 00:00:00 2001 From: cyberwarriorx Date: Tue, 6 Mar 2007 20:35:06 +0000 Subject: [PATCH] -Another patch from Dmitry Krutskih -Fixed a few warnings and removed some old code --- desmume/src/windows/mapView.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/desmume/src/windows/mapView.c b/desmume/src/windows/mapView.c index 02a532e62..2ad5b394c 100644 --- a/desmume/src/windows/mapView.c +++ b/desmume/src/windows/mapView.c @@ -125,33 +125,33 @@ LRESULT MapView_OnPaint(mapview_struct * win, HWND hwnd, WPARAM wParam, LPARAM l if (win->map < 3) textBG(SubScreen.gpu, win->map, (u8 *)win->bitmap); else - rotBG(SubScreen.gpu, win->map, win->bitmap); + rotBG(SubScreen.gpu, win->map, (u8 *)win->bitmap); break; case 2: if (win->map < 2) textBG(SubScreen.gpu, win->map, (u8 *)win->bitmap); else - rotBG(SubScreen.gpu, win->map, win->bitmap); + rotBG(SubScreen.gpu, win->map, (u8 *)win->bitmap); break; case 3: if (win->map < 3) textBG(SubScreen.gpu, win->map, (u8 *)win->bitmap); else - extRotBG(SubScreen.gpu, win->map, win->bitmap); + extRotBG(SubScreen.gpu, win->map, (u8 *)win->bitmap); break; case 4: if (win->map < 2) textBG(SubScreen.gpu, win->map, (u8 *)win->bitmap); else if (win->map < 3) - rotBG(SubScreen.gpu, win->map, win->bitmap); + rotBG(SubScreen.gpu, win->map, (u8 *)win->bitmap); else - extRotBG(SubScreen.gpu, win->map, win->bitmap); + extRotBG(SubScreen.gpu, win->map, (u8 *)win->bitmap); break; case 5: if (win->map < 2) textBG(SubScreen.gpu, win->map, (u8 *)win->bitmap); else - extRotBG(SubScreen.gpu, win->map, win->bitmap); + extRotBG(SubScreen.gpu, win->map, (u8 *)win->bitmap); break; } } @@ -166,38 +166,35 @@ LRESULT MapView_OnPaint(mapview_struct * win, HWND hwnd, WPARAM wParam, LPARAM l if (win->map < 3) textBG(MainScreen.gpu, win->map, (u8 *)win->bitmap); else - rotBG(MainScreen.gpu, win->map, win->bitmap); + rotBG(MainScreen.gpu, win->map, (u8 *)win->bitmap); break; case 2: if (win->map < 2) textBG(MainScreen.gpu, win->map, (u8 *)win->bitmap); else - rotBG(MainScreen.gpu, win->map, win->bitmap); + rotBG(MainScreen.gpu, win->map, (u8 *)win->bitmap); break; case 3: if (win->map < 3) textBG(MainScreen.gpu, win->map, (u8 *)win->bitmap); else - extRotBG(MainScreen.gpu, win->map, win->bitmap); + extRotBG(MainScreen.gpu, win->map, (u8 *)win->bitmap); break; case 4: if (win->map < 2) textBG(MainScreen.gpu, win->map, (u8 *)win->bitmap); else if (win->map < 3) - rotBG(MainScreen.gpu, win->map, win->bitmap); + rotBG(MainScreen.gpu, win->map, (u8 *)win->bitmap); else - extRotBG(MainScreen.gpu, win->map, win->bitmap); + extRotBG(MainScreen.gpu, win->map, (u8 *)win->bitmap); break; case 5: if (win->map < 2) textBG(MainScreen.gpu, win->map, (u8 *)win->bitmap); else - extRotBG(MainScreen.gpu, win->map, win->bitmap); + extRotBG(MainScreen.gpu, win->map, (u8 *)win->bitmap); break; } -// textBG(MainScreen.gpu, win->map, (u8 *)win->bitmap); - //rotBG(MainScreen.gpu, win->map, win->bitmap); - //extRotBG(MainScreen.gpu, win->map, win->bitmap); } SetDIBitsToDevice(hdc, 200, 4, lg, ht, 0, 0, 0, ht, win->bitmap, (BITMAPINFO*)&bmi, DIB_RGB_COLORS);