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

changed special color effect handling within windows

This commit is contained in:
mightymax 2007-01-13 22:18:33 +00:00
parent 5b3cadc8c6
commit eaf3f71688
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desmume/src/GPU.c
View File

@ -783,9 +783,6 @@ INLINE void renderline_setFinalColor(GPU *gpu,u32 passing,u8 bgnum,u8 *dst,u16 c
{ {
renderline_checkWindowOutside(gpu,bgnum,x,y,&windowDraw,&windowEffect) ; renderline_checkWindowOutside(gpu,bgnum,x,y,&windowDraw,&windowEffect) ;
} }
if (windowDraw==FALSE) return ;
if ((gpu->BLDCNT & (1 << bgnum)) && (windowEffect==TRUE)) /* the bg to draw has a special color effect */ if ((gpu->BLDCNT & (1 << bgnum)) && (windowEffect==TRUE)) /* the bg to draw has a special color effect */
{ {
switch (gpu->BLDCNT & 0xC0) /* type of special color effect */ switch (gpu->BLDCNT & 0xC0) /* type of special color effect */
@ -858,7 +855,8 @@ INLINE void renderline_setFinalColor(GPU *gpu,u32 passing,u8 bgnum,u8 *dst,u16 c
break ; break ;
} }
} else { } else {
/* when no effect is active */ /* only draw when effect is enabled on this pixel as source, or drawing itself is enabled */
if (((windowEffect==TRUE) && (gpu->BLDCNT & (0x100 << bgnum))) || (windowDraw == TRUE))
T2WriteWord(dst, passing, color) ; T2WriteWord(dst, passing, color) ;
} }
} ; } ;