[Scummvm-cvs-logs] scummvm master -> b25325599d4b88c323d3bf3319f7b6ee78f2e4c4

[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:
b25325599d MADS: Fix for penlight when starting a new game in Hard mode


Commit: b25325599d4b88c323d3bf3319f7b6ee78f2e4c4
    https://github.com/scummvm/scummvm/commit/b25325599d4b88c323d3bf3319f7b6ee78f2e4c4
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-03-08T12:05:54-04:00

Commit Message:
MADS: Fix for penlight when starting a new game in Hard mode

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



diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index 6de7ad9..cde998e 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -277,8 +277,8 @@ void GameNebular::initializeGlobals() {
 	// Final setup based on selected difficulty level
 	switch (_difficulty) {
 	case DIFFICULTY_HARD:
-		_objects.setRoom(OBJ_PLANT_STALK, NOWHERE);
-		_objects.setRoom(OBJ_PENLIGHT, NOWHERE);
+		_objects.setRoom(OBJ_BLOWGUN, NOWHERE);
+		_objects.setRoom(OBJ_NOTE, NOWHERE);
 
 		_globals[kLeavesStatus] = LEAVES_ON_GROUND;
 		_globals[kDurafailRecharged] = 0;
@@ -294,12 +294,10 @@ void GameNebular::initializeGlobals() {
 		break;
 
 	case DIFFICULTY_EASY:
-		_objects.setRoom(OBJ_BLOWGUN, NOWHERE);
-		_objects.setRoom(OBJ_NOTE, NOWHERE);
+		_objects.setRoom(OBJ_PLANT_STALK, NOWHERE);
+		_objects.setRoom(OBJ_PENLIGHT, NOWHERE);
 
 		_globals[kLeavesStatus] = LEAVES_ON_TRAP;
-		_globals[kPenlightCellStatus] = FIRST_TIME_UNCHARGED_DURAFAIL;
-		_globals[kDurafailRecharged] = 0;
 		break;
 	}