diff options
| -rw-r--r-- | engines/cge/cge_main.h | 1 | ||||
| -rw-r--r-- | engines/cge/events.cpp | 9 | ||||
| -rw-r--r-- | engines/cge/text.cpp | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/engines/cge/cge_main.h b/engines/cge/cge_main.h index bdb3121d63..d5f2e4f5fb 100644 --- a/engines/cge/cge_main.h +++ b/engines/cge/cge_main.h @@ -56,6 +56,7 @@ namespace CGE { #define kSystemRate 6 // 12 Hz #define kHeroFun0 (40 * 12) #define kHeroFun1 ( 2 * 12) +#define kShowScummVMVersion 15 #define kGetNamePrompt 50 #define kGetNameTitle 51 #define kTSeq 96 diff --git a/engines/cge/events.cpp b/engines/cge/events.cpp index 2c134baf92..8f76d2efd5 100644 --- a/engines/cge/events.cpp +++ b/engines/cge/events.cpp @@ -112,7 +112,14 @@ bool Keyboard::getKey(Common::Event &event, int &cgeCode) { cgeCode = 28; return true; } - if (keycode == Common::KEYCODE_F5) { + if (keycode == Common::KEYCODE_F1) { + if (event.type == Common::EVENT_KEYUP) + return false; + // Display ScummVM version and translation strings + for (int i = 0; i < 5; i++) + _vm->_commandHandler->addCommand(kCmdInf, 1, kShowScummVMVersion + i, NULL); + return false; + } else if (keycode == Common::KEYCODE_F5) { if (_vm->canSaveGameStateCurrently()) { const EnginePlugin *plugin = NULL; EngineMan.findGame(_vm->_gameDescription->gameid, &plugin); diff --git a/engines/cge/text.cpp b/engines/cge/text.cpp index 58acb5548c..021dad5709 100644 --- a/engines/cge/text.cpp +++ b/engines/cge/text.cpp @@ -177,6 +177,8 @@ void Text::say(const char *text, Sprite *spr) { void CGEEngine::inf(const char *text) { debugC(1, kCGEDebugEngine, "CGEEngine::inf(%s)", text); + if (!text) + return; killText(); _talk = new Talk(this, text, kTBRect); |