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

Added string back in 

It was deleted earlier due to a merge conflict.
This commit is contained in:
Samuel Yuan 2015-11-14 20:04:42 -05:00
parent 7f0deb2ced
commit 68ad452a07
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 (%ws) selected");
//Pop up Menu
DEF_STR(POPUP_PLAY, L"Play Game");

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

@ -115,19 +115,14 @@ void CNotification::DisplayMessage(int DisplayTime, const wchar_t * Message) con
void CNotification::DisplayMessageWide(int DisplayTime, const wchar_t * Message, ...) const
{
wchar_t Msg[1000];
va_list ap;
va_start(ap, Message);
DisplayMessageWide(DisplayTime, Message, ap);
}
_vsnwprintf(Msg, sizeof(Msg) - 1, Message, ap);
va_end(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);
DisplayMessage(DisplayTime, Msg);
}
void CNotification::DisplayMessage2(const wchar_t * Message) const

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

@ -36,7 +36,6 @@ public:
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);