diff options
| author | Eugene Sandulenko | 2017-08-02 10:24:35 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-08-04 21:54:19 +0200 |
| commit | cb48575c91071421f89ea394094072995a6e2c9b (patch) | |
| tree | 4171840eb365d16184eda6528fdb4a7c5a4ce1b5 | |
| parent | e236db8c3fc37bd9326f88e4fad7ac57454c70bf (diff) | |
| download | scummvm-rg350-cb48575c91071421f89ea394094072995a6e2c9b.tar.gz scummvm-rg350-cb48575c91071421f89ea394094072995a6e2c9b.tar.bz2 scummvm-rg350-cb48575c91071421f89ea394094072995a6e2c9b.zip | |
WAGE: Switched console rendering to MacTextWindow
| -rw-r--r-- | engines/wage/gui-console.cpp | 8 | ||||
| -rw-r--r-- | engines/wage/gui.cpp | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/engines/wage/gui-console.cpp b/engines/wage/gui-console.cpp index c2f1753ced..e86e6ab130 100644 --- a/engines/wage/gui-console.cpp +++ b/engines/wage/gui-console.cpp @@ -81,6 +81,9 @@ void Gui::clearOutput() { } void Gui::appendText(const char *s) { +#ifdef USE_MACTEXTWINDOW + _consoleWindow->appendText(s, getConsoleMacFont()); +#else Common::String str(s); _consoleDirty = true; @@ -107,9 +110,6 @@ void Gui::appendText(const char *s) { // Process last/leftover line _out.push_back(tmp); flowText(tmp); - -#ifdef USE_MACTEXTWINDOW1 - _consoleWindow->appendText(s, getConsoleMacFont()); #endif // USE_MACTEXTWINDOW } @@ -164,7 +164,7 @@ void Gui::reflowText() { for (uint i = 0; i < _out.size(); i++) flowText(_out[i]); -#ifdef USE_MACTEXTWINDOW +#ifdef USE_MACTEXTWINDOW1 // Append _lines content to MacTextWindow after it has // been processed by flowText above _consoleWindow->clearText(); diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp index 04419d5eea..e6e439b018 100644 --- a/engines/wage/gui.cpp +++ b/engines/wage/gui.cpp @@ -231,7 +231,9 @@ void Gui::draw() { } drawScene(); +#ifndef USE_MACTEXTWINDOW drawConsole(); +#endif _wm.draw(); |