ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows Port: 

- Fix Windows compiling.
This commit is contained in:
rogerman 2015-09-11 05:15:59 +00:00
parent 760b5a61d6
commit 73d1a89d21
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
desmume/src/windows/mapView.cpp
View File

@ -50,7 +50,7 @@ struct mapview_struct
//forgive the gyrations, some of this junk in here is to remind us of gyrations we might have to go //forgive the gyrations, some of this junk in here is to remind us of gyrations we might have to go
//through to avoid breaking the gpu struct //through to avoid breaking the gpu struct
gpu.debug = true; gpu.SetDebugState(true);
int temp = gpu.GetFinalColorBckFuncID(); int temp = gpu.GetFinalColorBckFuncID();
gpu.SetFinalColorBckFuncID(0); //hax... why arent we copying gpu now?? i cant remember gpu.SetFinalColorBckFuncID(0); //hax... why arent we copying gpu now?? i cant remember
@ -58,12 +58,10 @@ struct mapview_struct
for(u32 i = 0; i < gpu.BGSize[layerID][1]; ++i) for(u32 i = 0; i < gpu.BGSize[layerID][1]; ++i)
{ {
gpu.currDst = bitmap + i*gpu.BGSize[layerID][0]; gpu.ModeRenderDebug(i, layerID, bitmap + i*gpu.BGSize[layerID][0]);
gpu.currLine = i;
gpu.ModeRenderDebug(layerID);
} }
gpu.debug = false; gpu.SetDebugState(false);
gpu.SetFinalColorBckFuncID(temp); gpu.SetFinalColorBckFuncID(temp);
} }
}; };

3
desmume/src/windows/oamView.cpp
View File

@ -223,8 +223,7 @@ LRESULT OamView_OnPaint(HWND hwnd, oamview_struct *win, WPARAM wParam, LPARAM lP
GPUEngineBase copy = *win->gpu; GPUEngineBase copy = *win->gpu;
for(i = 0; i < 192; ++i) for(i = 0; i < 192; ++i)
{ {
copy.currLine = i; copy.SpriteRenderDebug(i, (u16*)(bitmap + i*256), bitmap_alpha + i*256, type + i*256, prio + i*256);
copy.SpriteRender((u16*)(bitmap + i*256), bitmap_alpha + i*256, type + i*256, prio + i*256);
} }
u32 width = dimm_int[(oam->attr1>>14)][(oam->attr0>>14)][0]; u32 width = dimm_int[(oam->attr1>>14)][(oam->attr0>>14)][0];