diff options
| author | Paul Gilbert | 2017-07-06 08:25:14 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-07-06 08:25:14 -0400 |
| commit | 1972fd0537607922aa82a6da67f17b45336ca170 (patch) | |
| tree | e22f029f71072fe67f496456a2d0776122410ee1 /engines | |
| parent | 6a16dfa670bf33d7d5f492648c459b5d563b56cf (diff) | |
| download | scummvm-rg350-1972fd0537607922aa82a6da67f17b45336ca170.tar.gz scummvm-rg350-1972fd0537607922aa82a6da67f17b45336ca170.tar.bz2 scummvm-rg350-1972fd0537607922aa82a6da67f17b45336ca170.zip | |
TITANIC: Don't show Access Denied on MissiveOMat after successful login
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/titanic/game/missiveomat.cpp | 10 | ||||
| -rw-r--r-- | engines/titanic/messages/messages.h | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/engines/titanic/game/missiveomat.cpp b/engines/titanic/game/missiveomat.cpp index fa0a9d7c74..3d2e4c28ce 100644 --- a/engines/titanic/game/missiveomat.cpp +++ b/engines/titanic/game/missiveomat.cpp @@ -75,7 +75,7 @@ void CMissiveOMat::load(SimpleFile *file) { } bool CMissiveOMat::EnterViewMsg(CEnterViewMsg *msg) { - CMissiveOMatActionMsg actionMsg(MESSAGE_9); + CMissiveOMatActionMsg actionMsg(MESSAGE_STARTUP); actionMsg.execute(this); return true; } @@ -161,7 +161,7 @@ bool CMissiveOMat::KeyCharMsg(CKeyCharMsg *msg) { if (validFlag) { // Credentials were valid, so log in _mode = MMODE_LOGGED_IN; - loadFrame(4); + setVisible(false); editMsg._mode = EDIT_CLEAR; editMsg.execute(loginControl); @@ -212,6 +212,7 @@ bool CMissiveOMat::TimerMsg(CTimerMsg *msg) { // Reset back to asking for a login username _mode = MMODE_USERNAME; loadFrame(1); + setVisible(true); CTreeItem *loginControl = findRoom()->findByName("MissiveOMat Login Control"); CEditControlMsg editMsg; @@ -275,7 +276,7 @@ bool CMissiveOMat::MissiveOMatActionMsg(CMissiveOMatActionMsg *msg) { case MESSAGE_5: { CMissiveOMatActionMsg actionMsg; - actionMsg._action = MESSAGE_9; + actionMsg._action = MESSAGE_STARTUP; actionMsg.execute(this); break; } @@ -301,7 +302,8 @@ bool CMissiveOMat::MissiveOMatActionMsg(CMissiveOMatActionMsg *msg) { } break; - case MESSAGE_9: { + case MESSAGE_STARTUP: { + setVisible(true); loadFrame(1); _mode = MMODE_USERNAME; _account = NO_ACCOUNT; diff --git a/engines/titanic/messages/messages.h b/engines/titanic/messages/messages.h index dfedfdb549..8f8c785e43 100644 --- a/engines/titanic/messages/messages.h +++ b/engines/titanic/messages/messages.h @@ -219,7 +219,7 @@ public: enum MissiveOMatAction { MESSAGE_NONE = 1, MESSAGE_SHOW = 2, NEXT_MESSAGE = 3, PRIOR_MESSAGE = 4, MESSAGE_5 = 5, MESSAGE_DOWN = 6, MESSAGE_UP = 7, REDRAW_MESSAGE = 8, - MESSAGE_9 = 9 + MESSAGE_STARTUP = 9 }; MESSAGE1(CActMsg, CString, action, ""); |