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

& is binary, && is logical 

there wasn't any typo (see behavior with window.nds)
This commit is contained in:
damdoum 2007-01-16 17:15:40 +00:00
parent 80a4b5d472
commit c9573f973d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
desmume/src/GPU.c
View File

@ -591,7 +591,7 @@ INLINE BOOL renderline_checkWindowInside(GPU *gpu, u8 bgnum, u16 x, u16 y, BOOL
)) ))
{ {
/* is drawing explicit set for this bg in this rectangle ? */ /* is drawing explicit set for this bg in this rectangle ? */
*draw = gpu->WINDOW_INCNT.windows.win0_en && (1<<bgnum); *draw = gpu->WINDOW_INCNT.windows.win0_en & (1<<bgnum);
*effect = gpu->WINDOW_INCNT.bits.WIN0_Effect_Enable ; *effect = gpu->WINDOW_INCNT.bits.WIN0_Effect_Enable ;
return TRUE ; return TRUE ;
} }
@ -604,7 +604,7 @@ INLINE BOOL renderline_checkWindowInside(GPU *gpu, u8 bgnum, u16 x, u16 y, BOOL
)) ))
{ {
/* is drawing explicit set for this bg in this rectangle ? */ /* is drawing explicit set for this bg in this rectangle ? */
*draw = gpu->WINDOW_INCNT.windows.win1_en && (1<<bgnum); *draw = gpu->WINDOW_INCNT.windows.win1_en & (1<<bgnum);
*effect = gpu->WINDOW_INCNT.bits.WIN1_Effect_Enable ; *effect = gpu->WINDOW_INCNT.bits.WIN1_Effect_Enable ;
return TRUE ; return TRUE ;
} }
@ -629,7 +629,7 @@ INLINE BOOL renderline_checkWindowOutside(GPU *gpu, u8 bgnum, u16 x, u16 y, BOOL
)) ))
{ {
/* is drawing explicit set for this bg in this rectangle ? */ /* is drawing explicit set for this bg in this rectangle ? */
*draw = gpu->WINDOW_OUTCNT.windows.win0_en && (1<<bgnum); *draw = gpu->WINDOW_OUTCNT.windows.win0_en & (1<<bgnum);
*effect = gpu->WINDOW_OUTCNT.bits.WIN0_Effect_Enable ; *effect = gpu->WINDOW_OUTCNT.bits.WIN0_Effect_Enable ;
return TRUE ; return TRUE ;
} }
@ -642,7 +642,7 @@ INLINE BOOL renderline_checkWindowOutside(GPU *gpu, u8 bgnum, u16 x, u16 y, BOOL
)) ))
{ {
/* is drawing explicit set for this bg in this rectangle ? */ /* is drawing explicit set for this bg in this rectangle ? */
*draw = gpu->WINDOW_OUTCNT.windows.win1_en && (1<<bgnum); *draw = gpu->WINDOW_OUTCNT.windows.win1_en & (1<<bgnum);
*effect = gpu->WINDOW_OUTCNT.bits.WIN1_Effect_Enable ; *effect = gpu->WINDOW_OUTCNT.bits.WIN1_Effect_Enable ;
return TRUE ; return TRUE ;
} }