From 75667980a76082613cb0f204e0f60af8c681b81f Mon Sep 17 00:00:00 2001 From: squall-leonhart Date: Sat, 12 May 2012 06:13:10 +0000 Subject: [PATCH] cleans up a unary minus unsigned still unsigned warning also fixes channel 3 in Mario and luigi super star saga. DON'T ASK ME HOW, i have no idea. Infact changing other area's affected the channels as well, so i have no idea how the fuck this works. git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1094 a31d4220-a93d-0410-bf67-fe4944624d44 --- src/apu/Gb_Oscs.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/apu/Gb_Oscs.cpp b/src/apu/Gb_Oscs.cpp index 644f6ddd..bba510b5 100644 --- a/src/apu/Gb_Oscs.cpp +++ b/src/apu/Gb_Oscs.cpp @@ -116,7 +116,7 @@ int Gb_Wave::access( unsigned addr ) const if ( enabled ) { addr = phase & (bank_size - 1); - if ( mode == Gb_Apu::mode_dmg ) + if ( mode == Gb_Apu::mode_agb ) { addr++; if ( delay > clk_mul ) @@ -442,7 +442,7 @@ static unsigned run_lfsr( unsigned s, unsigned mask, int count ) { // won't fully replace upper 8 bits, so have to do the unoptimized way while ( --count >= 0 ) - s = (s >> 1 | mask) ^ (mask & -((s - 1) & 2)); + s = (s >> 1 | mask) ^ (mask & (0 - ((s - 1) & 2))); } else {