From bfb312a3196c6a46c5048599ea3000608f5d01ce Mon Sep 17 00:00:00 2001 From: Matthew Stewart Date: Sat, 30 Jun 2018 22:38:15 -0400 Subject: STARTREK: Done with atmosphere loss event --- engines/startrek/rooms/mudd0.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'engines/startrek/rooms/mudd0.cpp') 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); -- cgit v1.2.3