[Scummvm-cvs-logs] scummvm master -> 8097aeb43a916dac160bda11201a6fc79a933c40
Strangerke
Strangerke at scummvm.org
Sun Nov 13 12:34:12 CET 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
8097aeb43a CGE: F1 now displays Soltys version and translators.
Commit: 8097aeb43a916dac160bda11201a6fc79a933c40
https://github.com/scummvm/scummvm/commit/8097aeb43a916dac160bda11201a6fc79a933c40
Author: Strangerke (strangerke at scummvm.org)
Date: 2011-11-13T03:33:36-08:00
Commit Message:
CGE: F1 now displays Soltys version and translators.
This is only available in versions modified or translated by the team
Changed paths:
engines/cge/cge_main.h
engines/cge/events.cpp
engines/cge/text.cpp
diff --git a/engines/cge/cge_main.h b/engines/cge/cge_main.h
index bdb3121..d5f2e4f 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 2c134ba..8f76d2e 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 58acb55..021dad5 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);
More information about the Scummvm-git-logs
mailing list