diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:35:23 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:40:58 +0200 |
| commit | 9c2341678ef4984bf92b3878295250faf980b066 (patch) | |
| tree | 2fb4805e05e16b9924e80c9947e6bad723b28c4b /engines/hugo/parser.cpp | |
| parent | 8172d679df5148a4a32f46074b20cb6caf91844f (diff) | |
| parent | a5f4ff36ffc386d48f2da49387a9655ce9295a4d (diff) | |
| download | scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.gz scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.bz2 scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.zip | |
Merge branch 'master'
Diffstat (limited to 'engines/hugo/parser.cpp')
| -rw-r--r-- | engines/hugo/parser.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/engines/hugo/parser.cpp b/engines/hugo/parser.cpp index bbf6c39f13..4eaed6fecf 100644 --- a/engines/hugo/parser.cpp +++ b/engines/hugo/parser.cpp @@ -271,7 +271,7 @@ void Parser::keyHandler(Common::Event event) { status_t &gameStatus = _vm->getGameStatus(); uint16 nChar = event.kbd.keycode; - if ((event.kbd.hasFlags(Common::KBD_ALT)) || (event.kbd.hasFlags(Common::KBD_SCRL))) + if (event.kbd.flags & (Common::KBD_ALT | Common::KBD_SCRL)) return; if (event.kbd.hasFlags(Common::KBD_CTRL)) { @@ -391,8 +391,6 @@ void Parser::command(const char *format, ...) { va_list marker; va_start(marker, format); -// TODO: -// _vm->_line = Common::String::vformat(format, marker); vsprintf(_vm->_line, format, marker); va_end(marker); |