aboutsummaryrefslogtreecommitdiff
path: root/engines/mads/user_interface.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2014-04-20 23:07:21 -0400
committerPaul Gilbert2014-04-20 23:07:21 -0400
commited4cedd81675f2ce57356dee90549ef52fb761b3 (patch)
tree2d7e22efa0957c2a95089d7d9f14b65359536f31 /engines/mads/user_interface.cpp
parentf0ce06f0e9e0ebcf21368fdf01856a026dd4d2fb (diff)
downloadscummvm-rg350-ed4cedd81675f2ce57356dee90549ef52fb761b3.tar.gz
scummvm-rg350-ed4cedd81675f2ce57356dee90549ef52fb761b3.tar.bz2
scummvm-rg350-ed4cedd81675f2ce57356dee90549ef52fb761b3.zip
MADS: Fixes for scene 210 conversation
Diffstat (limited to 'engines/mads/user_interface.cpp')
-rw-r--r--engines/mads/user_interface.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/engines/mads/user_interface.cpp b/engines/mads/user_interface.cpp
index 48e62a5ae5..a5e8a844f9 100644
--- a/engines/mads/user_interface.cpp
+++ b/engines/mads/user_interface.cpp
@@ -226,9 +226,13 @@ void Conversation::setup(int globalId, ...) {
}
va_end(va);
- assert(_vm->getGameID() == GType_RexNebular);
- Nebular::GameNebular *game = (Nebular::GameNebular *)_vm->_game;
- game->_globals[globalId] = -1;
+ if (quoteId < 0) {
+ // For an ending value of -1, also initial the bitflags for the global
+ // associated with the conversation entry, which enables all the quote Ids
+ assert(_vm->getGameID() == GType_RexNebular);
+ Nebular::GameNebular *game = (Nebular::GameNebular *)_vm->_game;
+ game->_globals[globalId] = (int16)0xffff;
+ }
_globalId = globalId;
}