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

-Fixed an issue where variables weren't being declared in the proper spot. This causes problems when compiling in Visual C++

This commit is contained in:
cyberwarriorx 2007-01-10 17:49:12 +00:00
parent ae80da0c57
commit b8fca1e8e4
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
desmume/src/GPU.c
View File

@ -127,6 +127,8 @@ void GPU_DeInit(GPU * gpu)
/* Sets up LCD control variables for Display Engines A and B for quick reading */
void GPU_setVideoProp(GPU * gpu, u32 p)
{
BOOL LayersEnable[5];
u16 WinBG;
struct _DISPCNT * cnt = &gpu->dispCnt.bitfield;
gpu->dispCnt.integer = p;
@ -183,10 +185,8 @@ void GPU_setVideoProp(GPU * gpu, u32 p)
GPU_setBGProp(gpu, 1, T1ReadWord(ARM9Mem.ARM9_REG, gpu->core * ADDRESS_STEP_4KB + 10));
GPU_setBGProp(gpu, 0, T1ReadWord(ARM9Mem.ARM9_REG, gpu->core * ADDRESS_STEP_4KB + 8));
BOOL LayersEnable[5];
u16 WinBG = (gpu->WINDOW_INCNT.val | gpu->WINDOW_OUTCNT.val);
WinBG = WinBG | (WinBG >> 8);
WinBG = (gpu->WINDOW_INCNT.val | gpu->WINDOW_OUTCNT.val);
WinBG = WinBG | (WinBG >> 8);
// Let's prepare the field for WINDOWS implementation
LayersEnable[0] = gpu->dispBG[0] && (cnt->BG0_Enable || (WinBG & 0x1));

4
desmume/src/GPU.h
View File

@ -434,8 +434,8 @@ static INLINE void GPU_ligne(Screen * screen, u16 l)
for(i16 = 0; i16 < 256; ++i16)
{
COLOR dstColor;
dstColor.val = T1ReadWord(dst, i16 << 1);
unsigned int r,g,b; // get components, 5bit each
dstColor.val = T1ReadWord(dst, i16 << 1);
r = dstColor.bitfield.red;
g = dstColor.bitfield.green;
b = dstColor.bitfield.blue;
@ -474,8 +474,8 @@ static INLINE void GPU_ligne(Screen * screen, u16 l)
for(i16 = 0; i16 < 256; ++i16)
{
COLOR dstColor;
dstColor.val = T1ReadWord(dst, i16 << 1);
unsigned int r,g,b; // get components, 5bit each
dstColor.val = T1ReadWord(dst, i16 << 1);
r = dstColor.bitfield.red;
g = dstColor.bitfield.green;
b = dstColor.bitfield.blue;