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

language: code clean up and fix some bugs

This commit is contained in:
zilmar 2015-03-05 09:44:25 +11:00
parent 9767f73f71
commit b635983167
2 changed files with 79 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Project64/User Interface/Main Menu Class.cpp
View File

@ -1055,7 +1055,7 @@ void CMainMenu::FillOutMenu ( HMENU hMenu )
*******************/ *******************/
if (g_Plugins->RSP() != NULL && IsMenu((HMENU)g_Plugins->RSP()->GetDebugMenu())) if (g_Plugins->RSP() != NULL && IsMenu((HMENU)g_Plugins->RSP()->GetDebugMenu()))
{ {
Item.Reset(ID_PLUGIN_MENU,EMPTY_STRING,NULL,g_Plugins->RSP()->GetDebugMenu(),L"&RSP" ); Item.Reset(ID_PLUGIN_MENU,EMPTY_STRING,EMPTY_STDSTR,g_Plugins->RSP()->GetDebugMenu(),L"&RSP");
DebugMenu.push_back(Item); DebugMenu.push_back(Item);
} }
@ -1063,24 +1063,27 @@ void CMainMenu::FillOutMenu ( HMENU hMenu )
*******************/ *******************/
if (g_Plugins->Gfx() != NULL && IsMenu((HMENU)g_Plugins->Gfx()->GetDebugMenu())) if (g_Plugins->Gfx() != NULL && IsMenu((HMENU)g_Plugins->Gfx()->GetDebugMenu()))
{ {
Item.Reset(ID_PLUGIN_MENU,EMPTY_STRING,NULL,g_Plugins->Gfx()->GetDebugMenu(),L"&RDP" ); Item.Reset(ID_PLUGIN_MENU,EMPTY_STRING,EMPTY_STDSTR,g_Plugins->Gfx()->GetDebugMenu(),L"&RDP");
DebugMenu.push_back(Item); DebugMenu.push_back(Item);
} }
/* Notification Menu /* Notification Menu
*******************/ *******************/
Item.Reset(ID_DEBUG_SHOW_UNHANDLED_MEM,EMPTY_STRING,EMPTY_STDSTR,NULL,L"On Unhandled Memory Actions"); Item.Reset(ID_DEBUG_SHOW_UNHANDLED_MEM,EMPTY_STRING,EMPTY_STDSTR,NULL,L"On Unhandled Memory Actions");
if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
{
Item.SetItemTicked(true); Item.SetItemTicked(true);
} }
DebugNotificationMenu.push_back(Item); DebugNotificationMenu.push_back(Item);
Item.Reset(ID_DEBUG_SHOW_PIF_ERRORS,EMPTY_STRING,EMPTY_STDSTR,NULL,L"On PIF Errors"); Item.Reset(ID_DEBUG_SHOW_PIF_ERRORS,EMPTY_STRING,EMPTY_STDSTR,NULL,L"On PIF Errors");
if (g_Settings->LoadBool(Debugger_ShowPifErrors)) { if (g_Settings->LoadBool(Debugger_ShowPifErrors))
{
Item.SetItemTicked(true); Item.SetItemTicked(true);
} }
DebugNotificationMenu.push_back(Item); DebugNotificationMenu.push_back(Item);
Item.Reset(ID_DEBUG_SHOW_DIV_BY_ZERO,EMPTY_STRING,EMPTY_STDSTR,NULL,L"On Div By Zero"); Item.Reset(ID_DEBUG_SHOW_DIV_BY_ZERO,EMPTY_STRING,EMPTY_STDSTR,NULL,L"On Div By Zero");
if (g_Settings->LoadBool(Debugger_ShowDivByZero)) { if (g_Settings->LoadBool(Debugger_ShowDivByZero))
{
Item.SetItemTicked(true); Item.SetItemTicked(true);
} }
DebugNotificationMenu.push_back(Item); DebugNotificationMenu.push_back(Item);

2
Source/Project64/User Interface/Notification Class.cpp
View File

@ -151,7 +151,7 @@ void CNotification::SetGfxPlugin( CGfxPlugin * Plugin )
void CNotification::SetWindowCaption (const wchar_t * Caption) void CNotification::SetWindowCaption (const wchar_t * Caption)
{ {
wchar_t WinTitle[256]; wchar_t WinTitle[256];
_snwprintf( WinTitle, sizeof(WinTitle), L"%s - %s", Caption, g_Settings->LoadString(Setting_ApplicationName).c_str()); _snwprintf( WinTitle, sizeof(WinTitle), L"%s - %s", Caption, g_Settings->LoadString(Setting_ApplicationName).ToUTF16().c_str());
WinTitle[sizeof(WinTitle) - 1] = 0; WinTitle[sizeof(WinTitle) - 1] = 0;
m_hWnd->Caption(WinTitle); m_hWnd->Caption(WinTitle);
} }