diff options
| author | Filippos Karapetis | 2014-05-30 03:08:20 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2014-05-30 03:11:20 +0300 |
| commit | ff3cc3bc0f9d12bd91fcd6e243d15f6a751a961f (patch) | |
| tree | 8896ed632f08ecdd874ddc58bba09a48a57cd6c8 /engines/mads | |
| parent | d1bab54a4ad9022ecc756acd09fa900f0a311404 (diff) | |
| download | scummvm-rg350-ff3cc3bc0f9d12bd91fcd6e243d15f6a751a961f.tar.gz scummvm-rg350-ff3cc3bc0f9d12bd91fcd6e243d15f6a751a961f.tar.bz2 scummvm-rg350-ff3cc3bc0f9d12bd91fcd6e243d15f6a751a961f.zip | |
MADS: Remove resolved FIXME in scene 307
Diffstat (limited to 'engines/mads')
| -rw-r--r-- | engines/mads/nebular/nebular_scenes3.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp index 6a6b36f1bc..a963484bd0 100644 --- a/engines/mads/nebular/nebular_scenes3.cpp +++ b/engines/mads/nebular/nebular_scenes3.cpp @@ -869,8 +869,7 @@ void Scene307::step() { } _lastFrameTime = _scene->_frameStartTime; - // FIXME: The active animation is never a zero pointer, so the guards never show up - if ((_guardTime > 3000) && !_duringPeeingFl /*&& (_scene->_activeAnimation == nullptr)*/ + if ((_guardTime > 3000) && !_duringPeeingFl && (_scene->_activeAnimation == nullptr) && (_game._screenObjects._inputMode != 1) && _globals[kMetBuddyBeast] && !_activePrisonerFl) { if (!_game._objects.isInInventory(OBJ_SCALPEL) && !_grateOpenedFl) { _game._player._stepEnabled = false; |