[Scummvm-cvs-logs] scummvm master -> 10361d077a5637f4e64620011b67190bfdeaaf9b

dreammaster dreammaster at scummvm.org
Sun Mar 8 16:19:24 CET 2015


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:
10361d077a MADS: Fix game startup settings for pit & batteries based on difficulty


Commit: 10361d077a5637f4e64620011b67190bfdeaaf9b
    https://github.com/scummvm/scummvm/commit/10361d077a5637f4e64620011b67190bfdeaaf9b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-03-08T11:18:10-04:00

Commit Message:
MADS: Fix game startup settings for pit & batteries based on difficulty

Changed paths:
    engines/mads/nebular/game_nebular.cpp
    engines/mads/nebular/nebular_scenes2.cpp



diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index 53cdc4d..6de7ad9 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -280,7 +280,9 @@ void GameNebular::initializeGlobals() {
 		_objects.setRoom(OBJ_PLANT_STALK, NOWHERE);
 		_objects.setRoom(OBJ_PENLIGHT, NOWHERE);
 
-		_globals[kLeavesStatus] = LEAVES_ON_TRAP;
+		_globals[kLeavesStatus] = LEAVES_ON_GROUND;
+		_globals[kDurafailRecharged] = 0;
+		_globals[kPenlightCellStatus] = FIRST_TIME_UNCHARGED_DURAFAIL;
 		break;
 
 	case DIFFICULTY_MEDIUM:
@@ -295,7 +297,7 @@ void GameNebular::initializeGlobals() {
 		_objects.setRoom(OBJ_BLOWGUN, NOWHERE);
 		_objects.setRoom(OBJ_NOTE, NOWHERE);
 
-		_globals[kLeavesStatus] = LEAVES_ON_GROUND;
+		_globals[kLeavesStatus] = LEAVES_ON_TRAP;
 		_globals[kPenlightCellStatus] = FIRST_TIME_UNCHARGED_DURAFAIL;
 		_globals[kDurafailRecharged] = 0;
 		break;
diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index bd8e8aa..499073e 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -1686,14 +1686,14 @@ void Scene208::updateTrap() {
 	}
 
 	switch (_globals[kLeavesStatus]) {
-	case 0: {
+	case LEAVES_ON_GROUND: {
 		_globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, 1);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 15);
 		int idx = _scene->_dynamicHotspots.add(NOUN_PILE_OF_LEAVES, VERB_WALKTO, _globals._sequenceIndexes[2], Common::Rect(0, 0, 0, 0));
 		_scene->_dynamicHotspots.setPosition(idx, Common::Point(60, 152), FACING_NORTH);
 		}
 		break;
-	case 2: {
+	case LEAVES_ON_TRAP: {
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 15);
 		_globals._sequenceIndexes[3] = _scene->_sequences.startCycle(_globals._spriteIndexes[3], false, 1);
 		_scene->_hotspots.activate(NOUN_DEEP_PIT, false);






More information about the Scummvm-git-logs mailing list