From 28fc0351fd44cb2a6f5d99dbc4df62c6ae48a965 Mon Sep 17 00:00:00 2001 From: John Peterson Date: Fri, 14 Nov 2008 16:35:39 +0000 Subject: [PATCH] Bugfix to log manager. Console and OSReport was mixed up. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1174 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/Common.h | 2 +- Source/Core/Core/Src/ActionReplay.cpp | 5 +++++ Source/Core/Core/Src/LogManager.cpp | 4 ++-- Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp | 1 - Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index 54b6f00e29..bc21880801 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -215,8 +215,8 @@ class LogTypes VIDEO, AUDIO, DYNA_REC, - OSREPORT, CONSOLE, + OSREPORT, WII_IOB, WII_IPC, WII_IPC_HLE, diff --git a/Source/Core/Core/Src/ActionReplay.cpp b/Source/Core/Core/Src/ActionReplay.cpp index 3f38e39c52..5bf61b6161 100644 --- a/Source/Core/Core/Src/ActionReplay.cpp +++ b/Source/Core/Core/Src/ActionReplay.cpp @@ -138,6 +138,8 @@ void LoadActionReplayCodes(IniFile &ini, bool bForGUI) void ActionReplayRunAllActive() { + LOGV(CONSOLE, 0, "ActionReplayRunAllActive %s", code.name.c_str()); + if (Core::GetStartupParameter().bEnableCheats) { for (std::vector::iterator iter = arCodes.begin(); iter != arCodes.end(); ++iter) if (iter->active) @@ -166,6 +168,9 @@ bool RunActionReplayCode(const ARCode &arcode) { code = arcode; + LOGV(CONSOLE, 0, "RunActionReplayCode %s", code.name.c_str()); + PanicAlert("RunActionReplayCode %s", code.name.c_str()); + for (iter = code.ops.begin(); iter != code.ops.end(); ++iter) { cmd = iter->cmd_addr >> 24; // AR command diff --git a/Source/Core/Core/Src/LogManager.cpp b/Source/Core/Core/Src/LogManager.cpp index a535f16467..75dd173aff 100644 --- a/Source/Core/Core/Src/LogManager.cpp +++ b/Source/Core/Core/Src/LogManager.cpp @@ -125,8 +125,8 @@ void LogManager::Init() m_Log[LogTypes::VIDEO + i*100] = new CDebugger_Log("Video", "Video Plugin", i); m_Log[LogTypes::AUDIO + i*100] = new CDebugger_Log("Audio", "Audio Plugin", i); m_Log[LogTypes::DYNA_REC + i*100] = new CDebugger_Log("DYNA", "Dynamic Recompiler", i); - m_Log[LogTypes::OSREPORT + i*100] = new CDebugger_Log("OSREPORT", "Dolphin Console", i); - m_Log[LogTypes::CONSOLE + i*100] = new CDebugger_Log("CONSOLE", "OSReport", i); + m_Log[LogTypes::CONSOLE + i*100] = new CDebugger_Log("CONSOLE", "Dolphin Console", i); + m_Log[LogTypes::OSREPORT + i*100] = new CDebugger_Log("OSREPORT", "OSReport", i); m_Log[LogTypes::WII_IOB + i*100] = new CDebugger_Log("WII_IOB", "WII IO Bridge", i); m_Log[LogTypes::WII_IPC + i*100] = new CDebugger_Log("WII_IPC", "WII IPC", i); m_Log[LogTypes::WII_IPC_HLE + i*100] = new CDebugger_Log("WII_IPC_HLE", "WII IPC HLE", i); diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp index 7eeaa38039..d5b04077ae 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp +++ b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp @@ -42,7 +42,6 @@ extern bool gSSBMremedy2; extern bool gSequenced; extern bool gVolume; extern bool gReset; -extern u32 gLastBlock; extern std::string gpName; extern CDebugger* m_frame; std::vector sMailLog, sMailTime; diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h index 7ab153c181..880c2f1972 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h +++ b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h @@ -27,7 +27,7 @@ extern bool gSequenced; extern bool gVolume; extern float ratioFactor; - +extern u32 gLastBlock; template inline int ReadOutPBsWii(u32 pbs_address, ParamBlockType& _pPBs, int _num, int _deb)