From: Spacy <sp...@us...> - 2006-08-25 13:30:42
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20255/src Modified Files: GBA.cpp Sound.cpp arm-new.h Log Message: applied patch [ 1471725 ] Silence some compilation warning (and fix some real bugs) Index: Sound.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Sound.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Sound.cpp 6 Jun 2006 21:04:20 -0000 1.17 --- Sound.cpp 25 Aug 2006 13:30:08 -0000 1.18 *************** *** 868,872 **** soundDSAValue = (soundDSFifoA[soundDSFifoAIndex]); ! soundDSFifoAIndex = (++soundDSFifoAIndex) & 31; soundDSFifoACount--; } else --- 868,872 ---- soundDSAValue = (soundDSFifoA[soundDSFifoAIndex]); ! soundDSFifoAIndex = (soundDSFifoAIndex + 1) & 31; soundDSFifoACount--; } else *************** *** 897,901 **** soundDSBValue = (soundDSFifoB[soundDSFifoBIndex]); ! soundDSFifoBIndex = (++soundDSFifoBIndex) & 31; soundDSFifoBCount--; } else { --- 897,901 ---- soundDSBValue = (soundDSFifoB[soundDSFifoBIndex]); ! soundDSFifoBIndex = (soundDSFifoBIndex + 1) & 31; soundDSFifoBCount--; } else { Index: GBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/GBA.cpp,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** GBA.cpp 24 Jun 2006 20:21:47 -0000 1.68 --- GBA.cpp 25 Aug 2006 13:30:08 -0000 1.69 *************** *** 2240,2244 **** int sw = 0; int dw = 0; - bool blank = false; int sc = c; --- 2240,2243 ---- *************** *** 4402,4404 **** 5000 #endif ! }; \ No newline at end of file --- 4401,4403 ---- 5000 #endif ! }; Index: arm-new.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/arm-new.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** arm-new.h 30 Apr 2006 14:34:50 -0000 1.17 --- arm-new.h 25 Aug 2006 13:30:08 -0000 1.18 *************** *** 8699,8701 **** if (clockTicks == 0) ! clockTicks = codeTicksAccessSeq32(oldArmNextPC) + 1; \ No newline at end of file --- 8699,8701 ---- if (clockTicks == 0) ! clockTicks = codeTicksAccessSeq32(oldArmNextPC) + 1; |