[Scummvm-cvs-logs] scummvm master -> 0503893f1cd1f3710e65dd43c236112b62ca1ecc
dreammaster
dreammaster at scummvm.org
Wed Mar 11 01:33:47 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:
0503893f1c MADS: Improved fix for giving batteries to Herman
Commit: 0503893f1cd1f3710e65dd43c236112b62ca1ecc
https://github.com/scummvm/scummvm/commit/0503893f1cd1f3710e65dd43c236112b62ca1ecc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-03-10T20:32:44-04:00
Commit Message:
MADS: Improved fix for giving batteries to Herman
Changed paths:
engines/mads/nebular/globals_nebular.h
engines/mads/nebular/nebular_scenes6.cpp
diff --git a/engines/mads/nebular/globals_nebular.h b/engines/mads/nebular/globals_nebular.h
index ce671f6..8d0c26d 100644
--- a/engines/mads/nebular/globals_nebular.h
+++ b/engines/mads/nebular/globals_nebular.h
@@ -150,7 +150,7 @@ enum GlobalId {
kConvHermit1 = 130,
kConvHermit2 = 131,
kHasTalkedToHermit = 132,
- kExecuted_1_11 = 133,
+ kHermitWantsBatteries = 133,
kHandsetCellStatus = 134,
kBeenInVideoStore = 135,
kDurafailRecharged = 136,
diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index 7887044..0675ce1 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -3275,8 +3275,7 @@ void Scene611::handleSubDialog1() {
// WORKAROUND: Fix bug in the original where the option to give Hermit batteries
// would be given before the player even has any batteries
- //if (!_game._objects.isInInventory(OBJ_DURAFAIL_CELLS) && !_game._objects.isInInventory(OBJ_PHONE_CELLS))
- // _globals[kExecuted_1_11] = true;
+ _globals[kHermitWantsBatteries] = true;
setDialogNode(1);
break;
@@ -3968,14 +3967,11 @@ void Scene611::enter() {
_scene->_hotspots.activate(NOUN_HERMIT, false);
}
- /* WORKAROUND: Pretty sure this is a debugging code fragment that should be ignored
- if (_globals[kExecuted_1_11]) {
- _dialog1.write(0x294, true);
- _dialog1.write(0x292, false);
- _globals[kExecuted_1_11] = true;
- }*/
- if ((_game._objects.isInInventory(OBJ_DURAFAIL_CELLS)) || (_game._objects.isInInventory(OBJ_PHONE_CELLS)))
- _dialog1.write(0x294, true);
+ // WORKAROUND: Fix original adding 'give batteries' option even if you don't have them
+ if (_globals[kHermitWantsBatteries]) {
+ if ((_game._objects.isInInventory(OBJ_DURAFAIL_CELLS)) || (_game._objects.isInInventory(OBJ_PHONE_CELLS)))
+ _dialog1.write(0x294, true);
+ }
if (_duringDialogFl) {
_game._player._playerPos = Common::Point(237, 129);
More information about the Scummvm-git-logs
mailing list