From 65ab3000a40637a511ae98814de1e893880c0598 Mon Sep 17 00:00:00 2001 From: bgk Date: Mon, 27 Oct 2008 20:06:04 +0000 Subject: [PATCH] Silenced a few warnings git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@786 a31d4220-a93d-0410-bf67-fe4944624d44 --- src/dmg/GB.cpp | 2 -- src/dmg/gbCheats.cpp | 4 ++-- src/dmg/gbMemory.cpp | 40 ++++++++++++++++++++-------------------- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/dmg/GB.cpp b/src/dmg/GB.cpp index 5957411d..2fe1e8ed 100644 --- a/src/dmg/GB.cpp +++ b/src/dmg/GB.cpp @@ -4770,8 +4770,6 @@ void gbEmulate(int ticksToStop) tempgbWindowLine = 146; } - int wy = inUseRegister_WY; - if(register_LY >= inUseRegister_WY) { if (tempgbWindowLine == -1) diff --git a/src/dmg/gbCheats.cpp b/src/dmg/gbCheats.cpp index 003ffc98..eec086e2 100644 --- a/src/dmg/gbCheats.cpp +++ b/src/dmg/gbCheats.cpp @@ -159,10 +159,10 @@ bool gbVerifyGsCode(const char *code) if(!GBCHEAT_IS_HEX(code[i])) return false; - int address = GBCHEAT_HEX_VALUE(code[6]) << 12 | +/* int address = GBCHEAT_HEX_VALUE(code[6]) << 12 | GBCHEAT_HEX_VALUE(code[7]) << 8 | GBCHEAT_HEX_VALUE(code[4]) << 4 | - GBCHEAT_HEX_VALUE(code[5]); + GBCHEAT_HEX_VALUE(code[5]);*/ return true; } diff --git a/src/dmg/gbMemory.cpp b/src/dmg/gbMemory.cpp index 32955c7a..e8d3cf87 100644 --- a/src/dmg/gbMemory.cpp +++ b/src/dmg/gbMemory.cpp @@ -1176,22 +1176,24 @@ mapperTAMA5 gbDataTAMA5 = { 0, // RAM Byte select 0, // mapper command number 0, // mapper last command; - 0, // commands 0x0 - 0, // commands 0x1 - 0, // commands 0x2 - 0, // commands 0x3 - 0, // commands 0x4 - 0, // commands 0x5 - 0, // commands 0x6 - 0, // commands 0x7 - 0, // commands 0x8 - 0, // commands 0x9 - 0, // commands 0xa - 0, // commands 0xb - 0, // commands 0xc - 0, // commands 0xd - 0, // commands 0xe - 0, // commands 0xf + { + 0, // commands 0x0 + 0, // commands 0x1 + 0, // commands 0x2 + 0, // commands 0x3 + 0, // commands 0x4 + 0, // commands 0x5 + 0, // commands 0x6 + 0, // commands 0x7 + 0, // commands 0x8 + 0, // commands 0x9 + 0, // commands 0xa + 0, // commands 0xb + 0, // commands 0xc + 0, // commands 0xd + 0, // commands 0xe + 0 // commands 0xf + }, 0, // register 0, // timer clock latch 0, // timer clock register @@ -1288,8 +1290,8 @@ void mapperTAMA5RAM(u16 address, u8 value) gbDataTAMA5.mapperCommands[gbDataTAMA5.mapperCommandNumber] = value; gbMemoryMap[0xa][0] = value; - int test = gbDataTAMA5.mapperCommands[gbDataTAMA5.mapperCommandNumber & 0x0e] | - (gbDataTAMA5.mapperCommands[(gbDataTAMA5.mapperCommandNumber & 0x0e) +1]<<4); +/* int test = gbDataTAMA5.mapperCommands[gbDataTAMA5.mapperCommandNumber & 0x0e] | + (gbDataTAMA5.mapperCommands[(gbDataTAMA5.mapperCommandNumber & 0x0e) +1]<<4);*/ if ((gbDataTAMA5.mapperCommandNumber & 0xe) == 0) // Read Command !!! { @@ -1643,8 +1645,6 @@ void memoryUpdateMapMMM01() // GameGenie ROM write registers void mapperGGROM(u16 address, u8 value) { - int tmpAddress = 0; - switch(address & 0x6000) { case 0x0000: // RAM enable register break;