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

Global Variable: Change so that local variable is not the same name as global

This commit is contained in:
zilmar 2012-11-17 12:26:00 +11:00
parent 6c954c690c
commit 7212599e24
2 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
Source/Project64/N64 System/Cheat Class.cpp
View File

@ -163,19 +163,19 @@ WORD ConvertXP64Value (WORD Value) {
return tmpValue; return tmpValue;
} }
void CCheats::ApplyCheats(CMipsMemory * g_MMU) void CCheats::ApplyCheats(CMipsMemory * MMU)
{ {
for (size_t CurrentCheat = 0; CurrentCheat < m_Codes.size(); CurrentCheat ++) for (size_t CurrentCheat = 0; CurrentCheat < m_Codes.size(); CurrentCheat ++)
{ {
const CODES & CodeEntry = m_Codes[CurrentCheat]; const CODES & CodeEntry = m_Codes[CurrentCheat];
for (size_t CurrentEntry = 0; CurrentEntry < CodeEntry.size();) for (size_t CurrentEntry = 0; CurrentEntry < CodeEntry.size();)
{ {
CurrentEntry += ApplyCheatEntry(g_MMU, CodeEntry,CurrentEntry,TRUE); CurrentEntry += ApplyCheatEntry(MMU, CodeEntry,CurrentEntry,TRUE);
} }
} }
} }
void CCheats::ApplyGSButton (CMipsMemory * g_MMU) void CCheats::ApplyGSButton (CMipsMemory * MMU)
{ {
DWORD Address; DWORD Address;
for (size_t CurrentCheat = 0; CurrentCheat < m_Codes.size(); CurrentCheat ++) for (size_t CurrentCheat = 0; CurrentCheat < m_Codes.size(); CurrentCheat ++)
@ -187,20 +187,20 @@ void CCheats::ApplyGSButton (CMipsMemory * g_MMU)
switch (Code.Command & 0xFF000000) { switch (Code.Command & 0xFF000000) {
case 0x88000000: case 0x88000000:
Address = 0x80000000 | (Code.Command & 0xFFFFFF); Address = 0x80000000 | (Code.Command & 0xFFFFFF);
g_MMU->SB_VAddr(Address,(BYTE)Code.Value); MMU->SB_VAddr(Address,(BYTE)Code.Value);
break; break;
case 0x89000000: case 0x89000000:
Address = 0x80000000 | (Code.Command & 0xFFFFFF); Address = 0x80000000 | (Code.Command & 0xFFFFFF);
g_MMU->SH_VAddr(Address,Code.Value); MMU->SH_VAddr(Address,Code.Value);
break; break;
// Xplorer64 // Xplorer64
case 0xA8000000: case 0xA8000000:
Address = 0x80000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF); Address = 0x80000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF);
g_MMU->SB_VAddr(Address,(BYTE)ConvertXP64Value(Code.Value)); MMU->SB_VAddr(Address,(BYTE)ConvertXP64Value(Code.Value));
break; break;
case 0xA9000000: case 0xA9000000:
Address = 0x80000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF); Address = 0x80000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF);
g_MMU->SH_VAddr(Address,ConvertXP64Value(Code.Value)); MMU->SH_VAddr(Address,ConvertXP64Value(Code.Value));
break; break;
} }
} }
@ -286,7 +286,7 @@ bool CCheats::IsValid16BitCode (LPCSTR CheatString) const
return true; return true;
} }
int CCheats::ApplyCheatEntry (CMipsMemory * g_MMU, const CODES & CodeEntry, int CurrentEntry, BOOL Execute ) int CCheats::ApplyCheatEntry (CMipsMemory * MMU, const CODES & CodeEntry, int CurrentEntry, BOOL Execute )
{ {
if (CurrentEntry < 0 || CurrentEntry >= (int)CodeEntry.size()) if (CurrentEntry < 0 || CurrentEntry >= (int)CodeEntry.size())
{ {
@ -318,7 +318,7 @@ int CCheats::ApplyCheatEntry (CMipsMemory * g_MMU, const CODES & CodeEntry, int
Address = 0x80000000 | (NextCodeEntry.Command & 0xFFFFFF); Address = 0x80000000 | (NextCodeEntry.Command & 0xFFFFFF);
wMemory = NextCodeEntry.Value; wMemory = NextCodeEntry.Value;
for (i=0; i<numrepeats; i++) { for (i=0; i<numrepeats; i++) {
g_MMU->SB_VAddr(Address,(BYTE)wMemory); MMU->SB_VAddr(Address,(BYTE)wMemory);
Address += offset; Address += offset;
wMemory += (WORD)incr; wMemory += (WORD)incr;
} }
@ -328,7 +328,7 @@ int CCheats::ApplyCheatEntry (CMipsMemory * g_MMU, const CODES & CodeEntry, int
Address = 0x80000000 | (NextCodeEntry.Command & 0xFFFFFF); Address = 0x80000000 | (NextCodeEntry.Command & 0xFFFFFF);
wMemory = NextCodeEntry.Value; wMemory = NextCodeEntry.Value;
for (i=0; i<numrepeats; i++) { for (i=0; i<numrepeats; i++) {
g_MMU->SH_VAddr(Address,wMemory); MMU->SH_VAddr(Address,wMemory);
Address += offset; Address += offset;
wMemory += (WORD)incr; wMemory += (WORD)incr;
} }
@ -339,90 +339,90 @@ int CCheats::ApplyCheatEntry (CMipsMemory * g_MMU, const CODES & CodeEntry, int
break; break;
case 0x80000000: case 0x80000000:
Address = 0x80000000 | (Code.Command & 0xFFFFFF); Address = 0x80000000 | (Code.Command & 0xFFFFFF);
if (Execute) { g_MMU->SB_VAddr(Address,(BYTE)Code.Value); } if (Execute) { MMU->SB_VAddr(Address,(BYTE)Code.Value); }
break; break;
case 0x81000000: case 0x81000000:
Address = 0x80000000 | (Code.Command & 0xFFFFFF); Address = 0x80000000 | (Code.Command & 0xFFFFFF);
if (Execute) { g_MMU->SH_VAddr(Address,Code.Value); } if (Execute) { MMU->SH_VAddr(Address,Code.Value); }
break; break;
case 0xA0000000: case 0xA0000000:
Address = 0xA0000000 | (Code.Command & 0xFFFFFF); Address = 0xA0000000 | (Code.Command & 0xFFFFFF);
if (Execute) { g_MMU->SB_VAddr(Address,(BYTE)Code.Value); } if (Execute) { MMU->SB_VAddr(Address,(BYTE)Code.Value); }
break; break;
case 0xA1000000: case 0xA1000000:
Address = 0xA0000000 | (Code.Command & 0xFFFFFF); Address = 0xA0000000 | (Code.Command & 0xFFFFFF);
if (Execute) { g_MMU->SH_VAddr(Address,Code.Value); } if (Execute) { MMU->SH_VAddr(Address,Code.Value); }
break; break;
case 0xD0000000: // Added by Witten (witten@pj64cheats.net) case 0xD0000000: // Added by Witten (witten@pj64cheats.net)
Address = 0x80000000 | (Code.Command & 0xFFFFFF); Address = 0x80000000 | (Code.Command & 0xFFFFFF);
g_MMU->LB_VAddr(Address,bMemory); MMU->LB_VAddr(Address,bMemory);
if (bMemory != Code.Value) { Execute = FALSE; } if (bMemory != Code.Value) { Execute = FALSE; }
return ApplyCheatEntry(g_MMU,CodeEntry,CurrentEntry + 1,Execute) + 1; return ApplyCheatEntry(MMU,CodeEntry,CurrentEntry + 1,Execute) + 1;
case 0xD1000000: // Added by Witten (witten@pj64cheats.net) case 0xD1000000: // Added by Witten (witten@pj64cheats.net)
Address = 0x80000000 | (Code.Command & 0xFFFFFF); Address = 0x80000000 | (Code.Command & 0xFFFFFF);
g_MMU->LH_VAddr(Address,wMemory); MMU->LH_VAddr(Address,wMemory);
if (wMemory != Code.Value) { Execute = FALSE; } if (wMemory != Code.Value) { Execute = FALSE; }
return ApplyCheatEntry(g_MMU,CodeEntry,CurrentEntry + 1,Execute) + 1; return ApplyCheatEntry(MMU,CodeEntry,CurrentEntry + 1,Execute) + 1;
case 0xD2000000: // Added by Witten (witten@pj64cheats.net) case 0xD2000000: // Added by Witten (witten@pj64cheats.net)
Address = 0x80000000 | (Code.Command & 0xFFFFFF); Address = 0x80000000 | (Code.Command & 0xFFFFFF);
g_MMU->LB_VAddr(Address,bMemory); MMU->LB_VAddr(Address,bMemory);
if (bMemory == Code.Value) { Execute = FALSE; } if (bMemory == Code.Value) { Execute = FALSE; }
return ApplyCheatEntry(g_MMU,CodeEntry,CurrentEntry + 1,Execute) + 1; return ApplyCheatEntry(MMU,CodeEntry,CurrentEntry + 1,Execute) + 1;
case 0xD3000000: // Added by Witten (witten@pj64cheats.net) case 0xD3000000: // Added by Witten (witten@pj64cheats.net)
Address = 0x80000000 | (Code.Command & 0xFFFFFF); Address = 0x80000000 | (Code.Command & 0xFFFFFF);
g_MMU->LH_VAddr(Address,wMemory); MMU->LH_VAddr(Address,wMemory);
if (wMemory == Code.Value) { Execute = FALSE; } if (wMemory == Code.Value) { Execute = FALSE; }
return ApplyCheatEntry(g_MMU,CodeEntry,CurrentEntry + 1,Execute) + 1; return ApplyCheatEntry(MMU,CodeEntry,CurrentEntry + 1,Execute) + 1;
// Xplorer64 (Author: Witten) // Xplorer64 (Author: Witten)
case 0x30000000: case 0x30000000:
case 0x82000000: case 0x82000000:
case 0x84000000: case 0x84000000:
Address = 0x80000000 | (Code.Command & 0xFFFFFF); Address = 0x80000000 | (Code.Command & 0xFFFFFF);
if (Execute) { g_MMU->SB_VAddr(Address,(BYTE)Code.Value); } if (Execute) { MMU->SB_VAddr(Address,(BYTE)Code.Value); }
break; break;
case 0x31000000: case 0x31000000:
case 0x83000000: case 0x83000000:
case 0x85000000: case 0x85000000:
Address = 0x80000000 | (Code.Command & 0xFFFFFF); Address = 0x80000000 | (Code.Command & 0xFFFFFF);
if (Execute) { g_MMU->SH_VAddr(Address,Code.Value); } if (Execute) { MMU->SH_VAddr(Address,Code.Value); }
break; break;
case 0xE8000000: case 0xE8000000:
Address = 0x80000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF); Address = 0x80000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF);
if (Execute) { g_MMU->SB_VAddr(Address,(BYTE)ConvertXP64Value(Code.Value)); } if (Execute) { MMU->SB_VAddr(Address,(BYTE)ConvertXP64Value(Code.Value)); }
break; break;
case 0xE9000000: case 0xE9000000:
Address = 0x80000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF); Address = 0x80000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF);
if (Execute) { g_MMU->SH_VAddr(Address,ConvertXP64Value(Code.Value)); } if (Execute) { MMU->SH_VAddr(Address,ConvertXP64Value(Code.Value)); }
break; break;
case 0xC8000000: case 0xC8000000:
Address = 0xA0000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF); Address = 0xA0000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF);
if (Execute) { g_MMU->SB_VAddr(Address,(BYTE)Code.Value); } if (Execute) { MMU->SB_VAddr(Address,(BYTE)Code.Value); }
break; break;
case 0xC9000000: case 0xC9000000:
Address = 0xA0000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF); Address = 0xA0000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF);
if (Execute) { g_MMU->SH_VAddr(Address,ConvertXP64Value(Code.Value)); } if (Execute) { MMU->SH_VAddr(Address,ConvertXP64Value(Code.Value)); }
break; break;
case 0xB8000000: case 0xB8000000:
Address = 0x80000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF); Address = 0x80000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF);
g_MMU->LB_VAddr(Address,bMemory); MMU->LB_VAddr(Address,bMemory);
if (bMemory != ConvertXP64Value(Code.Value)) { Execute = FALSE; } if (bMemory != ConvertXP64Value(Code.Value)) { Execute = FALSE; }
return ApplyCheatEntry(g_MMU,CodeEntry,CurrentEntry + 1,Execute) + 1; return ApplyCheatEntry(MMU,CodeEntry,CurrentEntry + 1,Execute) + 1;
case 0xB9000000: case 0xB9000000:
Address = 0x80000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF); Address = 0x80000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF);
g_MMU->LH_VAddr(Address,wMemory); MMU->LH_VAddr(Address,wMemory);
if (wMemory != ConvertXP64Value(Code.Value)) { Execute = FALSE; } if (wMemory != ConvertXP64Value(Code.Value)) { Execute = FALSE; }
return ApplyCheatEntry(g_MMU,CodeEntry,CurrentEntry + 1,Execute) + 1; return ApplyCheatEntry(MMU,CodeEntry,CurrentEntry + 1,Execute) + 1;
case 0xBA000000: case 0xBA000000:
Address = 0x80000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF); Address = 0x80000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF);
g_MMU->LB_VAddr(Address,bMemory); MMU->LB_VAddr(Address,bMemory);
if (bMemory == ConvertXP64Value(Code.Value)) { Execute = FALSE; } if (bMemory == ConvertXP64Value(Code.Value)) { Execute = FALSE; }
return ApplyCheatEntry(g_MMU,CodeEntry,CurrentEntry + 1,Execute) + 1; return ApplyCheatEntry(MMU,CodeEntry,CurrentEntry + 1,Execute) + 1;
case 0xBB000000: case 0xBB000000:
Address = 0x80000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF); Address = 0x80000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF);
g_MMU->LH_VAddr(Address,wMemory); MMU->LH_VAddr(Address,wMemory);
if (wMemory == ConvertXP64Value(Code.Value)) { Execute = FALSE; } if (wMemory == ConvertXP64Value(Code.Value)) { Execute = FALSE; }
return ApplyCheatEntry(g_MMU,CodeEntry,CurrentEntry + 1,Execute) + 1; return ApplyCheatEntry(MMU,CodeEntry,CurrentEntry + 1,Execute) + 1;
case 0: return MaxGSEntries; break; case 0: return MaxGSEntries; break;
} }
return 1; return 1;

6
Source/Project64/N64 System/Cheat Class.h
View File

@ -45,7 +45,7 @@ class CCheats {
void CheckParentStatus ( WND_HANDLE hParent ); void CheckParentStatus ( WND_HANDLE hParent );
static stdstr ReadCodeString ( WND_HANDLE hDlg, bool &validcodes, bool &validoption, bool &nooptions, int &codeformat ); static stdstr ReadCodeString ( WND_HANDLE hDlg, bool &validcodes, bool &validoption, bool &nooptions, int &codeformat );
static stdstr ReadOptionsString( WND_HANDLE hDlg, bool &validcodes, bool &validoptions, bool &nooptions, int &codeformat ); static stdstr ReadOptionsString( WND_HANDLE hDlg, bool &validcodes, bool &validoptions, bool &nooptions, int &codeformat );
int ApplyCheatEntry (CMipsMemory * g_MMU,const CODES & CodeEntry, int CurrentEntry, BOOL Execute ); int ApplyCheatEntry (CMipsMemory * MMU,const CODES & CodeEntry, int CurrentEntry, BOOL Execute );
void RecordCheatValues ( WND_HANDLE hDlg ); void RecordCheatValues ( WND_HANDLE hDlg );
bool CheatChanged ( WND_HANDLE hDlg ); bool CheatChanged ( WND_HANDLE hDlg );
bool IsValid16BitCode ( LPCSTR CheatString ) const; bool IsValid16BitCode ( LPCSTR CheatString ) const;
@ -70,8 +70,8 @@ public:
~CCheats ( void ); ~CCheats ( void );
bool IsCheatMessage ( MSG * msg ); bool IsCheatMessage ( MSG * msg );
void ApplyCheats ( CMipsMemory * g_MMU ); void ApplyCheats ( CMipsMemory * MMU );
void ApplyGSButton ( CMipsMemory * g_MMU ); void ApplyGSButton ( CMipsMemory * MMU );
void LoadCheats ( bool DisableSelected ); void LoadCheats ( bool DisableSelected );
void SelectCheats ( WND_HANDLE hParent, bool BlockExecution ); void SelectCheats ( WND_HANDLE hParent, bool BlockExecution );
inline bool CheatsSlectionChanged ( void ) const { return m_CheatSelectionChanged; } inline bool CheatsSlectionChanged ( void ) const { return m_CheatSelectionChanged; }