libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-30 14:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MADS: Fixes for giving batteries to Hermin

Browse Source
This commit is contained in:
Paul Gilbert 2014-06-01 22:36:16 -04:00
parent 3c287aad18
commit 62e5fdc95c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/mads/nebular/game_nebular.cpp
View File

@ -551,6 +551,7 @@ void GameNebular::doObjectAction() {
_objects.addToInventory(OBJ_DURAFAIL_CELLS);
dialogs.showItem(OBJ_DURAFAIL_CELLS,
_difficulty != DIFFICULTY_HARD || _globals[kDurafailRecharged] ? 415 : 414);
_globals[kDurafailRecharged] = true;
break;
case 2:
_objects.addToInventory(OBJ_DURAFAIL_CELLS);

8
engines/mads/nebular/nebular_scenes6.cpp
View File

@ -3156,7 +3156,8 @@ bool Scene611::check2ChargedBatteries() {
}
bool Scene611::check4ChargedBatteries() {
if (_game._objects.isInInventory(OBJ_DURAFAIL_CELLS) && _game._objects.isInInventory(OBJ_PHONE_CELLS) && _globals[136])
if (_game._objects.isInInventory(OBJ_DURAFAIL_CELLS) && _game._objects.isInInventory(OBJ_PHONE_CELLS)
&& _globals[kDurafailRecharged])
return true;
return false;
@ -3954,7 +3955,6 @@ void Scene611::enter() {
if (!_globals[kHasTalkedToHermit]) {
_scene->loadAnimation(Resources::formatName(611, 'h', -1, EXT_AA, ""), 0);
_scene->loadAnimation(Resources::formatName(203, 'a', -1, EXT_AA, ""), 81);
_nextFrame = 47;
_hermitMode = 1;
_hermitTalkingFl = false;
@ -4145,7 +4145,7 @@ void Scene611::step() {
_hermitMode = 1;
}
if ((_scene->_activeAnimation->getCurrentFrame() == 240) && _check1Fl) {
if (_scene->_activeAnimation != nullptr && (_scene->_activeAnimation->getCurrentFrame() == 240) && _check1Fl) {
_check1Fl = false;
_scene->_kernelMessages.add(Common::Point(33, 88), 0xFDFC, 0, 0, 90, _game.getQuote(0x27E));
_scene->_sequences.addTimer(120, 120);
@ -4234,7 +4234,7 @@ void Scene611::step() {
}
}
if (_scene->_activeAnimation->getCurrentFrame() == 254)
if (_scene->_activeAnimation != nullptr && _scene->_activeAnimation->getCurrentFrame() == 254)
_game._player._stepEnabled = true;
if (_game._trigger == 110) {