aboutsummaryrefslogtreecommitdiff
path: root/engines/startrek/rooms/mudd0.cpp
diff options
context:
space:
mode:
authorMatthew Stewart2018-06-30 22:38:15 -0400
committerEugene Sandulenko2018-08-09 08:37:30 +0200
commitbfb312a3196c6a46c5048599ea3000608f5d01ce (patch)
tree1cff65f93fe889b4006329e47a73e756f31f134c /engines/startrek/rooms/mudd0.cpp
parent933ab32b0e42a4c4a30901ea5605ef3e0096c2be (diff)
downloadscummvm-rg350-bfb312a3196c6a46c5048599ea3000608f5d01ce.tar.gz
scummvm-rg350-bfb312a3196c6a46c5048599ea3000608f5d01ce.tar.bz2
scummvm-rg350-bfb312a3196c6a46c5048599ea3000608f5d01ce.zip
STARTREK: Done with atmosphere loss event
Diffstat (limited to 'engines/startrek/rooms/mudd0.cpp')
-rw-r--r--engines/startrek/rooms/mudd0.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/engines/startrek/rooms/mudd0.cpp b/engines/startrek/rooms/mudd0.cpp
index 3506ed8bcb..bb26440fac 100644
--- a/engines/startrek/rooms/mudd0.cpp
+++ b/engines/startrek/rooms/mudd0.cpp
@@ -41,7 +41,11 @@ namespace StarTrek {
void Room::mudd0Tick1() {
playVoc("MUD0LOOP");
- _vm->_awayMission.disableInput = 2;
+ // ENHANCEMENT: Only disable input when Mudd showing Mudd cutscene (avoids a long,
+ // pointless delay when entering the room otherwise)
+ if (!_vm->_awayMission.mudd.enteredRoom0ForFirstTime)
+ _vm->_awayMission.disableInput = 2;
+
loadActorAnim(OBJECT_MUDD, "s4cbhr", 0xa2, 0xa9, 0);
// Floppy version's code.
@@ -63,9 +67,10 @@ void Room::mudd0Tick50() {
}
void Room::mudd0Tick60() {
- _vm->_awayMission.disableInput = false;
-
if (_vm->_awayMission.mudd.field29 == 0) {
+ // ENHANCEMENT: Move this into if statement (related to above enhancement)
+ _vm->_awayMission.disableInput = false;
+
_vm->_awayMission.mudd.field29++;
showText(TX_SPEAKER_MUDD, TX_MUD0_037);