From 6ea0d508726fdefd86e22ae035300301cd9ae327 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Sat, 29 May 2010 21:28:27 +0000 Subject: [PATCH] Make this work with debug builds again. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5540 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp | 1 + Source/Core/DiscIO/Src/WiiWad.cpp | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp index 682a3e2125..5e3945b8d2 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp @@ -712,6 +712,7 @@ int ParseAttribList(u8* pAttribIDList, u16& _startID, u16& _endID) #if MAX_LOGLEVEL >= DEBUG_LEVEL _dbg_assert_(WII_IPC_WIIMOTE, sequence == SDP_SEQ8); + (void)seqSize; #else (void)sequence, (void)seqSize; #endif diff --git a/Source/Core/DiscIO/Src/WiiWad.cpp b/Source/Core/DiscIO/Src/WiiWad.cpp index 485db02d0b..28d98bfa88 100644 --- a/Source/Core/DiscIO/Src/WiiWad.cpp +++ b/Source/Core/DiscIO/Src/WiiWad.cpp @@ -107,12 +107,16 @@ bool WiiWAD::ParseWAD(DiscIO::IBlobReader& _rReader) return false; m_CertificateChainSize = ReaderBig.Read32(0x8); - // u32 Reserved = ReaderBig.Read32(0xC); + u32 Reserved = ReaderBig.Read32(0xC); m_TicketSize = ReaderBig.Read32(0x10); m_TMDSize = ReaderBig.Read32(0x14); m_DataAppSize = ReaderBig.Read32(0x18); m_FooterSize = ReaderBig.Read32(0x1C); +#if MAX_LOGLEVEL >= DEBUG_LEVEL _dbg_assert_msg_(BOOT, Reserved==0x00, "WiiWAD: Reserved must be 0x00"); +#else + (void)Reserved; +#endif u32 Offset = 0x40; m_pCertificateChain = CreateWADEntry(_rReader, m_CertificateChainSize, Offset); Offset += ROUND_UP(m_CertificateChainSize, 0x40);