diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2013-08-24 01:41:17 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2013-08-24 01:41:17 +0200 |
| commit | 367d6dfd6569ccd7f1788768bb6e593df2dd4c5d (patch) | |
| tree | e7fcf4d78b5b69f33e47a6ada64c23eb32f0be9f /Source/Core/VideoCommon | |
| parent | 6df36ec6871df74e96b44a9648de113b4b57e914 (diff) | |
Add an OSD message when taking screenshots in D3D9/D3D11
Fixes issue 6486.
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/Src/OnScreenDisplay.cpp | 5 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Src/OnScreenDisplay.h | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp b/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp index 29a3837a9a..72abcd5752 100644 --- a/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp +++ b/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp @@ -58,6 +58,11 @@ void AddMessage(const char* pstr, u32 ms) s_listMsgs.push_back(MESSAGE(pstr, Common::Timer::GetTimeMs() + ms)); } +void AddMessage(const std::string& str, u32 ms) +{ + AddMessage(str.c_str(), ms); +} + void DrawMessages() { if(!SConfig::GetInstance().m_LocalCoreStartupParameter.bOnScreenDisplayMessages) diff --git a/Source/Core/VideoCommon/Src/OnScreenDisplay.h b/Source/Core/VideoCommon/Src/OnScreenDisplay.h index ef7d899e1f..6db53f0ead 100644 --- a/Source/Core/VideoCommon/Src/OnScreenDisplay.h +++ b/Source/Core/VideoCommon/Src/OnScreenDisplay.h @@ -5,11 +5,14 @@ #ifndef _OSD_H_ #define _OSD_H_ -namespace OSD +#include <string> + +namespace OSD { // On-screen message display void AddMessage(const char* str, u32 ms = 2000); +void AddMessage(const std::string& str, u32 ms = 2000); void DrawMessages(); // draw the current messages on the screen. Only call once per frame. void ClearMessages(); |
