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

Fixed "Save Slot (%s) selected" Text 

The text was not showing up correctly because it was not using wide
strings. This worked in an earlier build, but was changed not too long
ago.
This commit is contained in:
Samuel Yuan 2015-11-13 20:16:01 -05:00
parent 9e744ef180
commit 958d9c26bb
7 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lang/Chinese (Simplified).pj.Lang
View File

@ -88,6 +88,7 @@
#198# "插槽 8"
#199# "插槽 9"
#200# "插槽 10"
#201# "插槽 (%s) 被选"
//Pop up Menu
#210# "运行游戏"
@ -224,7 +225,7 @@
#452# " 选择材质包目录"
//Options Dialog
#460# "当窗口处于非活动状态时暂停模拟器"
#460# "当模拟器窗口不是处于屏幕最上方，暂停模拟器"
#461# "载入ROM后切换为全屏模式"
#462# "隐藏高级设置"
#463# "记住已选择的金手指"
@ -255,7 +256,7 @@
#503# "自我修改码方案:"
#504# "默认存档容量:"
#505# "高级模块连接"
#506# "当ROM加载后，开始模拟"
#506# "当读取完ROM后，开始模拟"
#507# "总是从 RDB 中覆盖默认设置"
#508# "自动压缩即时存档文件"
#509# "开启调试器"

1
Lang/English.pj.Lang
View File

@ -88,6 +88,7 @@
#198# "Slot 8"
#199# "Slot 9"
#200# "Slot 10"
#201# "Save Slot (%s) selected"
//Pop up Menu
#210# "Play Game"

1
Source/Project64/Multilanguage.h
View File

@ -117,6 +117,7 @@ enum LanguageStringID{
MENU_SLOT_8 = 198,
MENU_SLOT_9 = 199,
MENU_SLOT_10 = 200,
MENU_SLOT_SAVE = 201,
//Pop up Menu
POPUP_PLAY = 210,

1
Source/Project64/Multilanguage/Language Class.cpp
View File

@ -124,6 +124,7 @@ void CLanguage::LoadDefaultStrings (void)
DEF_STR(MENU_SLOT_8, L"Slot 8" );
DEF_STR(MENU_SLOT_9, L"Slot 9" );
DEF_STR(MENU_SLOT_10, L"Slot 10" );
DEF_STR(MENU_SLOT_SAVE, L"Save Slot (%s) selected");
//Pop up Menu
DEF_STR(POPUP_PLAY, L"Play Game" );

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

@ -519,7 +519,7 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
case ID_DEBUGGER_INTERRUPT_PI: g_BaseSystem->ExternalEvent(SysEvent_Interrupt_PI); break;
case ID_DEBUGGER_INTERRUPT_DP: g_BaseSystem->ExternalEvent(SysEvent_Interrupt_DP); break;
case ID_CURRENT_SAVE_DEFAULT:
g_Notify->DisplayMessage(3, stdstr_f("Save Slot (%s) selected", GetSaveSlotString(MenuID - ID_CURRENT_SAVE_DEFAULT).c_str()).ToUTF16().c_str());
g_Notify->DisplayMessageWide(3, GS(MENU_SLOT_SAVE), GetSaveSlotString(MenuID - ID_CURRENT_SAVE_DEFAULT).c_str());
g_Settings->SaveDword(Game_CurrentSaveState, (DWORD)(MenuID - ID_CURRENT_SAVE_DEFAULT));
break;
case ID_CURRENT_SAVE_1:
@ -531,8 +531,8 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
case ID_CURRENT_SAVE_7:
case ID_CURRENT_SAVE_8:
case ID_CURRENT_SAVE_9:
case ID_CURRENT_SAVE_10:
g_Notify->DisplayMessage(3, stdstr_f("Save Slot (%s) selected", GetSaveSlotString((MenuID - ID_CURRENT_SAVE_1) + 1)).ToUTF16().c_str());
case ID_CURRENT_SAVE_10:
g_Notify->DisplayMessageWide(3, GS(MENU_SLOT_SAVE), GetSaveSlotString((MenuID - ID_CURRENT_SAVE_1) + 1).c_str());
g_Settings->SaveDword(Game_CurrentSaveState, (DWORD)((MenuID - ID_CURRENT_SAVE_1) + 1));
break;
case ID_HELP_SUPPORTFORUM: ShellExecute(NULL, "open", "http://forum.pj64-emu.com/", NULL, NULL, SW_SHOWMAXIMIZED); break;

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

@ -113,6 +113,23 @@ void CNotification::DisplayMessage(int DisplayTime, const wchar_t * Message) con
}
}
void CNotification::DisplayMessageWide(int DisplayTime, const wchar_t * Message, ...) const
{
va_list ap;
va_start(ap, Message);
DisplayMessageWide(DisplayTime, Message, ap);
}
void CNotification::DisplayMessageWide(int DisplayTime, const wchar_t * Message, va_list ap) const
{
wchar_t Msg[1000];
_vsnwprintf(Msg, sizeof(Msg) - 1, Message, ap);
va_end(ap);
DisplayMessage(DisplayTime, Msg);
}
void CNotification::DisplayMessage2(const wchar_t * Message) const
{
if (!m_hWnd) { return; }

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

@ -35,6 +35,8 @@ public:
//User Feedback
virtual void DisplayMessage(int DisplayTime, const wchar_t * Message) const;
virtual void DisplayMessage(int DisplayTime, LanguageStringID StringID) const;
virtual void DisplayMessageWide(int DisplayTime, const wchar_t * Message, ...) const;
virtual void DisplayMessageWide(int DisplayTime, const wchar_t * Message, va_list ap) const;
virtual void DisplayMessage2(const wchar_t * Message) const;
virtual void BreakPoint(const wchar_t * FileName, const int LineNumber);