From 6a27ce126475321f136a7a6bc9a389c5d7854bd1 Mon Sep 17 00:00:00 2001 From: zeromus Date: Wed, 17 Mar 2010 21:25:11 +0000 Subject: [PATCH] gpu: fix 3d blending color effects being applied when they shouldnt be --- desmume/src/GPU.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/desmume/src/GPU.cpp b/desmume/src/GPU.cpp index c599ec2b4..23edbf1bd 100644 --- a/desmume/src/GPU.cpp +++ b/desmume/src/GPU.cpp @@ -575,7 +575,9 @@ FORCEINLINE FASTCALL void GPU::_master_setFinal3dColor(int dstX, int srcX) u8* dst = currDst; u16 final; - bool windowEffect = true; + bool windowEffect = blend1; //bomberman land touch dialogbox will fail without setting to blend1 + + //TODO - should we do an alpha==0 -> bail out entirely check here? if(WINDOW) { @@ -605,7 +607,7 @@ FORCEINLINE FASTCALL void GPU::_master_setFinal3dColor(int dstX, int srcX) } else final = R6G6B6TORGB15(red,green,blue); } - else + else { final = R6G6B6TORGB15(red,green,blue); //perform the special effect