[Scummvm-cvs-logs] scummvm master -> 5a3d85e3538c1d16ab4e21b4a767cea759bd2324

[dreammaster]

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:
5a3d85e353 MADS: Finally re-enable Rex waking up in the first game scene


Commit: 5a3d85e3538c1d16ab4e21b4a767cea759bd2324
    https://github.com/scummvm/scummvm/commit/5a3d85e3538c1d16ab4e21b4a767cea759bd2324
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-06-04T09:35:10-04:00

Commit Message:
MADS: Finally re-enable Rex waking up in the first game scene

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



diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp
index 8cf4107..888b0f7 100644
--- a/engines/mads/nebular/nebular_scenes1.cpp
+++ b/engines/mads/nebular/nebular_scenes1.cpp
@@ -188,10 +188,6 @@ void Scene101::enter() {
 	_scene->_hotspots.activate(NOUN_SHIELD_MODULATOR, false);
 	_panelOpened = false;
 
-	// HACK: set the prior scene to 102 for now when the game starts, to avoid Rex's getting up animation
-	if (_scene->_priorSceneId == -1)
-		_scene->_priorSceneId = 102;
-
 	if (_scene->_priorSceneId != -1)
 		_globals[kNeedToStandUp] = false;