diff --git a/Source/Project64/Multilanguage.h b/Source/Project64/Multilanguage.h index 559e03930..9b37d1418 100644 --- a/Source/Project64/Multilanguage.h +++ b/Source/Project64/Multilanguage.h @@ -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, diff --git a/Source/Project64/Multilanguage/Language Class.cpp b/Source/Project64/Multilanguage/Language Class.cpp index 5794c80c4..0321de0fc 100644 --- a/Source/Project64/Multilanguage/Language Class.cpp +++ b/Source/Project64/Multilanguage/Language Class.cpp @@ -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"); diff --git a/Source/Project64/User Interface/Notification Class.cpp b/Source/Project64/User Interface/Notification Class.cpp index 126f1d99f..bfc28b558 100644 --- a/Source/Project64/User Interface/Notification Class.cpp +++ b/Source/Project64/User Interface/Notification Class.cpp @@ -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 diff --git a/Source/Project64/User Interface/Notification Class.h b/Source/Project64/User Interface/Notification Class.h index 5f8aebcb3..c853371bc 100644 --- a/Source/Project64/User Interface/Notification Class.h +++ b/Source/Project64/User Interface/Notification Class.h @@ -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);