diff options
Diffstat (limited to 'engines/hdb/ai-funcs.cpp')
| -rw-r--r-- | engines/hdb/ai-funcs.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/engines/hdb/ai-funcs.cpp b/engines/hdb/ai-funcs.cpp index da4efc0d49..721fcbd227 100644 --- a/engines/hdb/ai-funcs.cpp +++ b/engines/hdb/ai-funcs.cpp @@ -2196,9 +2196,13 @@ void AI::movePlayer(uint16 buttons) { if (g_hdb->_window->dialogActive()) { g_hdb->_window->closeDialog(); return; + } else if (g_hdb->_window->dialogChoiceActive()) { + g_hdb->_window->closeDialogChoice(); + return; + } else if (g_hdb->_window->msgBarActive()) { + g_hdb->_window->closeMsg(); + return; } - warning("STUB: movePlayer: Add DialogChoice Check"); - warning("STUB: movePlayer: Add MessageBar Check"); if (cinematicsActive() || _playerLock) return; @@ -2302,7 +2306,11 @@ void AI::movePlayer(uint16 buttons) { if (!cinematicsActive()) return; - warning("STUB: movePlayer: Add Choice Dialog"); + // is a choice dialog active? + if (g_hdb->_window->dialogChoiceActive()) { + if (!cinematicsActive()) + return; + } // In a cinematic? if (_playerLock || _numWaypoints) |