diff options
| author | Thierry Crozat | 2017-12-02 23:18:29 +0000 |
|---|---|---|
| committer | Thierry Crozat | 2018-01-23 02:15:42 +0000 |
| commit | 1b2e4f926c644d5835409c7a78d1ca8d58783c3e (patch) | |
| tree | 113d17676b902914cddd10d865fe0a91fa8ae994 /engines/supernova/supernova.h | |
| parent | 0c5f02959f12b62fe4a25bf9fb8445bc4b35e8f6 (diff) | |
| download | scummvm-rg350-1b2e4f926c644d5835409c7a78d1ca8d58783c3e.tar.gz scummvm-rg350-1b2e4f926c644d5835409c7a78d1ca8d58783c3e.tar.bz2 scummvm-rg350-1b2e4f926c644d5835409c7a78d1ca8d58783c3e.zip | |
SUPERNOVA: Implement alarm
Diffstat (limited to 'engines/supernova/supernova.h')
| -rw-r--r-- | engines/supernova/supernova.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/engines/supernova/supernova.h b/engines/supernova/supernova.h index d452213682..5602ce6035 100644 --- a/engines/supernova/supernova.h +++ b/engines/supernova/supernova.h @@ -156,8 +156,14 @@ public: return textWidth(text.c_str()); } void renderMessage(StringID stringId, MessagePosition position = kMessageNormal, Common::String var1 = "", Common::String var2 = "") { - //TODO : Merge the gameString and the variables, if any - renderMessage(getGameString(stringId), position); + Common::String text = getGameString(stringId); + if (!var1.empty()) { + if (!var2.empty()) + text = Common::String::format(text.c_str(), var1.c_str(), var2.c_str()); + else + text = Common::String::format(text.c_str(), var1.c_str()); + } + renderMessage(text, position); } void renderMessage(const Common::String &text, MessagePosition position = kMessageNormal) { if (!text.empty()) |