ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@959 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
omegadox 2008-10-25 13:43:46 +00:00
parent 92f991dd2b
commit 681a40dd36
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,6 @@ void LoadActionReplayCodes(IniFile &ini)
currentCode.name = line; currentCode.name = line;
if (line[0] == '+') currentCode.active = true; if (line[0] == '+') currentCode.active = true;
else currentCode.active = false; else currentCode.active = false;
currentCode.failed = false;
continue; continue;
} }
@ -130,7 +129,7 @@ void LoadActionReplayCodes(IniFile &ini)
void ActionReplayRunAllActive() void ActionReplayRunAllActive()
{ {
if (Core::GetStartupParameter().bEnableCheats && !fail) { if (Core::GetStartupParameter().bEnableCheats && !fail) {
for (std::vector<ARCode>::iterator iter = arCodes.begin(); iter != arCodes.end(); ++iter) for (std::vector<ARCode>::const_iterator iter = arCodes.begin(); iter != arCodes.end(); ++iter)
if (iter->active) if (iter->active)
RunActionReplayCode(*iter, false); RunActionReplayCode(*iter, false);
} }
@ -141,12 +140,8 @@ void ActionReplayRunAllActive()
// For example, some authors have created codes that add features to AR. Hacks for popular ones can be added here, // For example, some authors have created codes that add features to AR. Hacks for popular ones can be added here,
// but the problem is not generally solvable. // but the problem is not generally solvable.
// TODO: what is "nowIsBootup" for? // TODO: what is "nowIsBootup" for?
void RunActionReplayCode(ARCode &arcode, bool nowIsBootup) { void RunActionReplayCode(const ARCode &arcode, bool nowIsBootup) {
code = arcode; code = arcode;
if (arcode.failed) // If the code doesn't work, skip it
return;
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; cmd = iter->cmd_addr >> 24;
@ -172,7 +167,7 @@ void RunActionReplayCode(ARCode &arcode, bool nowIsBootup) {
// ActionReplay program self modification codes // ActionReplay program self modification codes
if (addr >= 0x00002000 && addr < 0x00003000) { if (addr >= 0x00002000 && addr < 0x00003000) {
PanicAlert("This action replay simulator does not support codes that modify Action Replay itself."); PanicAlert("This action replay simulator does not support codes that modify Action Replay itself.");
arcode.failed = true; fail = true;
return; return;
} }
@ -207,7 +202,7 @@ void RunActionReplayCode(ARCode &arcode, bool nowIsBootup) {
continue; continue;
default: default:
PanicAlert("Zero code unknown to dolphin: %08x",zcode); PanicAlert("Zero code unknown to dolphin: %08x",zcode);
arcode.failed = true; fail = true;
return; return;
} }
} }

3
Source/Core/Core/Src/ActionReplay.h
View File

@ -24,10 +24,9 @@ struct ARCode {
std::string name; std::string name;
std::vector<AREntry> ops; std::vector<AREntry> ops;
bool active; bool active;
bool failed;
}; };
void ActionReplayRunAllActive(); void ActionReplayRunAllActive();
void RunActionReplayCode(ARCode &arcode, bool nowIsBootup); void RunActionReplayCode(const ARCode &arcode, bool nowIsBootup);
void LoadActionReplayCodes(IniFile &ini); void LoadActionReplayCodes(IniFile &ini);