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

Project64: Update the code related to changes in stdstr

This commit is contained in:
zilmar 2013-04-17 20:34:20 +10:00
parent 5c8b6fd2e2
commit b805bbb883
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -542,7 +542,7 @@ stdstr CCheats::GetCheatName(int CheatNo, bool AddExtension) const
if (!IsValid16BitCode(CodeString)) if (!IsValid16BitCode(CodeString))
{ {
Name.Format("*** %s",Name.c_str()); Name.Format("*** %s",Name.c_str());
Name.replace("\\","\\*** "); Name.Replace("\\","\\*** ");
} }
if (AddExtension && CheatUsesCodeExtensions(LineEntry)) { if (AddExtension && CheatUsesCodeExtensions(LineEntry)) {
stdstr CheatValue(g_Settings->LoadStringIndex(Cheat_Extension,CheatNo)); stdstr CheatValue(g_Settings->LoadStringIndex(Cheat_Extension,CheatNo));

4
Source/Project64/N64 System/Recompiler/Loop Analysis.cpp
View File

@ -911,6 +911,8 @@ void LoopAnalysis::SPECIAL_SYSCALL ( CCodeSection * Section )
{ {
g_Notify->BreakPoint(__FILE__,__LINE__); g_Notify->BreakPoint(__FILE__,__LINE__);
} }
#else
Section = Section;
#endif #endif
m_NextInstruction = END_BLOCK; m_NextInstruction = END_BLOCK;
m_PC -= 4; m_PC -= 4;
@ -929,6 +931,8 @@ void LoopAnalysis::SPECIAL_BREAK ( CCodeSection * Section )
{ {
g_Notify->BreakPoint(__FILE__,__LINE__); g_Notify->BreakPoint(__FILE__,__LINE__);
} }
#else
Section = Section;
#endif #endif
m_NextInstruction = END_BLOCK; m_NextInstruction = END_BLOCK;
m_PC -= 4; m_PC -= 4;

2
Source/Project64/Settings/SettingType/SettingsType-Application.cpp
View File

@ -270,7 +270,7 @@ stdstr CSettingTypeApplication::FixSectionName(LPCSTR Section)
{ {
SectionName = "default"; SectionName = "default";
} }
SectionName.replace("\\","-"); SectionName.Replace("\\","-");
} }
return SectionName; return SectionName;
} }

4
Source/Project64/User Interface/Settings/Settings Page - Keyboard Shortcuts.cpp
View File

@ -104,8 +104,8 @@ void COptionsShortCutsPage::OnCpuStateChanged(UINT /*Code*/, int /*id*/, HWND /*
} }
stdstr str = GS(Item->second.Title()); 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, HTREEITEM hItem = m_MenuItems.InsertItem(TVIF_TEXT | TVIF_PARAM,str.c_str(),0,0,0,0,
(DWORD_PTR)&Item->second,hParent,TVI_LAST); (DWORD_PTR)&Item->second,hParent,TVI_LAST);