diff options
Diffstat (limited to 'engines/fullpipe/messagehandlers.cpp')
| -rw-r--r-- | engines/fullpipe/messagehandlers.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/engines/fullpipe/messagehandlers.cpp b/engines/fullpipe/messagehandlers.cpp index 947caadbcc..bd75e01232 100644 --- a/engines/fullpipe/messagehandlers.cpp +++ b/engines/fullpipe/messagehandlers.cpp @@ -188,11 +188,15 @@ int global_messageHandler1(ExCommand *cmd) { } break; case '\t': + // Demo has no map + if (g_fp->isDemo() && g_fp->getLanguage() == Common::RU_RUS) + break; + if (g_fp->_flgCanOpenMap) g_fp->openMap(); cmd->_messageKind = 0; break; - case 'p': + case Common::KEYCODE_F1: if (g_fp->_flgCanOpenMap) g_fp->openHelp(); cmd->_messageKind = 0; @@ -308,7 +312,7 @@ int global_messageHandler2(ExCommand *cmd) { ani->_callback2 = staticANIObjectCallback; } else { ani->setFlags40(false); - ani->_callback2 = 0; + ani->_callback2 = 0; // Really NULL } } break; @@ -515,7 +519,7 @@ int global_messageHandler3(ExCommand *cmd) { if (cmd->_objtype == kObjTypeObjstateCommand) { ObjstateCommand *c = (ObjstateCommand *)cmd; result = 1; - g_fp->setObjectState(c->_objCommandName, c->_value); + g_fp->setObjectState(c->_objCommandName.c_str(), c->_value); } return result; default: |