diff --git a/Source/Project64/N64 System/Cheat Class.cpp b/Source/Project64/N64 System/Cheat Class.cpp index ac4597541..d65432140 100644 --- a/Source/Project64/N64 System/Cheat Class.cpp +++ b/Source/Project64/N64 System/Cheat Class.cpp @@ -542,7 +542,7 @@ stdstr CCheats::GetCheatName(int CheatNo, bool AddExtension) const if (!IsValid16BitCode(CodeString)) { Name.Format("*** %s",Name.c_str()); - Name.replace("\\","\\*** "); + Name.Replace("\\","\\*** "); } if (AddExtension && CheatUsesCodeExtensions(LineEntry)) { stdstr CheatValue(g_Settings->LoadStringIndex(Cheat_Extension,CheatNo)); diff --git a/Source/Project64/N64 System/Recompiler/Loop Analysis.cpp b/Source/Project64/N64 System/Recompiler/Loop Analysis.cpp index 18d50aaa2..83f05c1da 100644 --- a/Source/Project64/N64 System/Recompiler/Loop Analysis.cpp +++ b/Source/Project64/N64 System/Recompiler/Loop Analysis.cpp @@ -911,6 +911,8 @@ void LoopAnalysis::SPECIAL_SYSCALL ( CCodeSection * Section ) { g_Notify->BreakPoint(__FILE__,__LINE__); } +#else + Section = Section; #endif m_NextInstruction = END_BLOCK; m_PC -= 4; @@ -929,6 +931,8 @@ void LoopAnalysis::SPECIAL_BREAK ( CCodeSection * Section ) { g_Notify->BreakPoint(__FILE__,__LINE__); } +#else + Section = Section; #endif m_NextInstruction = END_BLOCK; m_PC -= 4; diff --git a/Source/Project64/Settings/SettingType/SettingsType-Application.cpp b/Source/Project64/Settings/SettingType/SettingsType-Application.cpp index 2c0643140..a51e51875 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-Application.cpp +++ b/Source/Project64/Settings/SettingType/SettingsType-Application.cpp @@ -270,7 +270,7 @@ stdstr CSettingTypeApplication::FixSectionName(LPCSTR Section) { SectionName = "default"; } - SectionName.replace("\\","-"); + SectionName.Replace("\\","-"); } return SectionName; } diff --git a/Source/Project64/User Interface/Settings/Settings Page - Keyboard Shortcuts.cpp b/Source/Project64/User Interface/Settings/Settings Page - Keyboard Shortcuts.cpp index 48924c594..92cf2b8e3 100644 --- a/Source/Project64/User Interface/Settings/Settings Page - Keyboard Shortcuts.cpp +++ b/Source/Project64/User Interface/Settings/Settings Page - Keyboard Shortcuts.cpp @@ -104,8 +104,8 @@ void COptionsShortCutsPage::OnCpuStateChanged(UINT /*Code*/, int /*id*/, HWND /* } stdstr str = GS(Item->second.Title()); - str.replace("&",""); - str.replace("...",""); + str.Replace("&",""); + str.Replace("...",""); HTREEITEM hItem = m_MenuItems.InsertItem(TVIF_TEXT | TVIF_PARAM,str.c_str(),0,0,0,0, (DWORD_PTR)&Item->second,hParent,TVI_LAST);