From 9ad879f1cef8c4008cc1f9ed6824f9d809ed04b0 Mon Sep 17 00:00:00 2001 From: mightymax Date: Wed, 10 Jan 2007 18:32:25 +0000 Subject: [PATCH] fixed outside window filter --- trunk/desmume/src/GPU.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/trunk/desmume/src/GPU.c b/trunk/desmume/src/GPU.c index 87e822cb2..a247cb9db 100644 --- a/trunk/desmume/src/GPU.c +++ b/trunk/desmume/src/GPU.c @@ -658,10 +658,10 @@ INLINE BOOL renderline_checkWindowOutside(GPU *gpu, u8 bgnum, u16 x, u16 y, BOOL /* priority to check the window regions: win0,win1,winobj */ if (gpu->dispCnt.bitfield.Win0_Enable) /* highest priority */ { - if ((gpu->WINDOW_XDIM[0].val) && (gpu->WINDOW_YDIM[0].val)) + if (!((gpu->WINDOW_XDIM[0].val) && (gpu->WINDOW_YDIM[0].val))) { - if ((((x >= gpu->WINDOW_XDIM[0].bitfield.start) && (x < gpu->WINDOW_XDIM[0].bitfield.end)) || (gpu->WINDOW_XDIM[0].bitfield.end==0)) - &&(y >= gpu->WINDOW_YDIM[0].bitfield.start) && (y < gpu->WINDOW_YDIM[0].bitfield.end)) + if (!((((x >= gpu->WINDOW_XDIM[0].bitfield.start) && (x < gpu->WINDOW_XDIM[0].bitfield.end)) || (gpu->WINDOW_XDIM[0].bitfield.end==0)) + &&(y >= gpu->WINDOW_YDIM[0].bitfield.start) && (y < gpu->WINDOW_YDIM[0].bitfield.end))) { switch (bgnum) { case 0: @@ -702,10 +702,10 @@ INLINE BOOL renderline_checkWindowOutside(GPU *gpu, u8 bgnum, u16 x, u16 y, BOOL } else if (gpu->dispCnt.bitfield.Win1_Enable) /* mid priority */ { - if ((gpu->WINDOW_XDIM[1].val) && (gpu->WINDOW_YDIM[1].val)) + if (!((gpu->WINDOW_XDIM[1].val) && (gpu->WINDOW_YDIM[1].val))) { - if ((((x >= gpu->WINDOW_XDIM[1].bitfield.start) && (x < gpu->WINDOW_XDIM[1].bitfield.end)) || (gpu->WINDOW_XDIM[1].bitfield.end==0)) - &&(y >= gpu->WINDOW_YDIM[1].bitfield.start) && (y < gpu->WINDOW_YDIM[1].bitfield.end)) + if (!((((x >= gpu->WINDOW_XDIM[1].bitfield.start) && (x < gpu->WINDOW_XDIM[1].bitfield.end)) || (gpu->WINDOW_XDIM[1].bitfield.end==0)) + &&(y >= gpu->WINDOW_YDIM[1].bitfield.start) && (y < gpu->WINDOW_YDIM[1].bitfield.end))) { switch (bgnum) { case 0: