mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-26 03:35:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugfix to log manager. Console and OSReport was mixed up.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1174 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson 2008-11-14 16:35:39 +00:00
parent 2d90e4c62c
commit 28fc0351fd
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/Src/Common.h
View File

@ -215,8 +215,8 @@ class LogTypes
VIDEO, VIDEO,
AUDIO, AUDIO,
DYNA_REC, DYNA_REC,
OSREPORT,
CONSOLE, CONSOLE,
OSREPORT,
WII_IOB, WII_IOB,
WII_IPC, WII_IPC,
WII_IPC_HLE, WII_IPC_HLE,

5
Source/Core/Core/Src/ActionReplay.cpp
View File

@ -138,6 +138,8 @@ void LoadActionReplayCodes(IniFile &ini, bool bForGUI)
void ActionReplayRunAllActive() void ActionReplayRunAllActive()
{ {
LOGV(CONSOLE, 0, "ActionReplayRunAllActive %s", code.name.c_str());
if (Core::GetStartupParameter().bEnableCheats) { if (Core::GetStartupParameter().bEnableCheats) {
for (std::vector<ARCode>::iterator iter = arCodes.begin(); iter != arCodes.end(); ++iter) for (std::vector<ARCode>::iterator iter = arCodes.begin(); iter != arCodes.end(); ++iter)
if (iter->active) if (iter->active)
@ -166,6 +168,9 @@ bool RunActionReplayCode(const ARCode &arcode) {
code = 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) for (iter = code.ops.begin(); iter != code.ops.end(); ++iter)
{ {
cmd = iter->cmd_addr >> 24; // AR command cmd = iter->cmd_addr >> 24; // AR command

4
Source/Core/Core/Src/LogManager.cpp
View File

@ -125,8 +125,8 @@ void LogManager::Init()
m_Log[LogTypes::VIDEO + i*100] = new CDebugger_Log("Video", "Video Plugin", i); 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::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::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", "Dolphin Console", i);
m_Log[LogTypes::CONSOLE + i*100] = new CDebugger_Log("CONSOLE", "OSReport", 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_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 + 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); m_Log[LogTypes::WII_IPC_HLE + i*100] = new CDebugger_Log("WII_IPC_HLE", "WII IPC HLE", i);

1
Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp
View File

@ -42,7 +42,6 @@ extern bool gSSBMremedy2;
extern bool gSequenced; extern bool gSequenced;
extern bool gVolume; extern bool gVolume;
extern bool gReset; extern bool gReset;
extern u32 gLastBlock;
extern std::string gpName; extern std::string gpName;
extern CDebugger* m_frame; extern CDebugger* m_frame;
std::vector<std::string> sMailLog, sMailTime; std::vector<std::string> sMailLog, sMailTime;

2
Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h
View File

@ -27,7 +27,7 @@
extern bool gSequenced; extern bool gSequenced;
extern bool gVolume; extern bool gVolume;
extern float ratioFactor; extern float ratioFactor;
extern u32 gLastBlock;
template<class ParamBlockType> template<class ParamBlockType>
inline int ReadOutPBsWii(u32 pbs_address, ParamBlockType& _pPBs, int _num, int _deb) inline int ReadOutPBsWii(u32 pbs_address, ParamBlockType& _pPBs, int _num, int _deb)