[Scummvm-git-logs] scummvm master -> 89d20bafa98168dbe58ba0b71058deaf6026e9ba

dreammaster dreammaster at scummvm.org
Wed Nov 22 01:33:11 CET 2017


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
89d20bafa9 MADS: Fix crash when Rex is locked in cell


Commit: 89d20bafa98168dbe58ba0b71058deaf6026e9ba
    https://github.com/scummvm/scummvm/commit/89d20bafa98168dbe58ba0b71058deaf6026e9ba
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-11-21T19:33:02-05:00

Commit Message:
MADS: Fix crash when Rex is locked in cell

Changed paths:
    engines/mads/nebular/nebular_scenes3.cpp


diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index 7323ee8..6c6afa9 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -881,6 +881,9 @@ void Scene307::step() {
 			_guardTime = 0;
 		} else if ((_prisonerTimer > 300) && (_game._screenObjects._inputMode != kInputConversation) && (_scene->_animation[0] == nullptr) && !_activePrisonerFl) {
 			if (!_globals[kMetBuddyBeast]) {
+				if (_prisonerMessageId == -1)
+					_prisonerMessageId = 0x104;
+
 				int idx = _scene->_kernelMessages.add(Common::Point(5, 51), 0xFDFC, 0, 81, 120, _game.getQuote(_prisonerMessageId));
 				_scene->_kernelMessages.setQuoted(idx, 4, true);
 				_prisonerMessageId++;





More information about the Scummvm-git-logs mailing list