diff options
| author | whiterandrek | 2018-05-12 18:26:12 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-06-28 23:51:32 +0200 |
| commit | 84529c917764275e3f74ed711f9eebcf07ff822c (patch) | |
| tree | 7755fa05c8c527842b6a49eb39d55c6c75ba8c14 /engines | |
| parent | 0d82a3062c0b4d8b0d922d76d2096ed619ccd267 (diff) | |
| download | scummvm-rg350-84529c917764275e3f74ed711f9eebcf07ff822c.tar.gz scummvm-rg350-84529c917764275e3f74ed711f9eebcf07ff822c.tar.bz2 scummvm-rg350-84529c917764275e3f74ed711f9eebcf07ff822c.zip | |
PINK: fixed entering to Mucky Duck Pub
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/pink/objects/handlers/handler_timer.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/engines/pink/objects/handlers/handler_timer.cpp b/engines/pink/objects/handlers/handler_timer.cpp index 3de4ad4a71..2c478fcc29 100644 --- a/engines/pink/objects/handlers/handler_timer.cpp +++ b/engines/pink/objects/handlers/handler_timer.cpp @@ -24,7 +24,6 @@ #include "handler_timer.h" #include <common/debug.h> #include <engines/pink/archive.h> -#include <engines/pink/objects/condition.h> #include <engines/pink/objects/sequences/sequence.h> #include <engines/pink/objects/side_effect.h> #include <engines/pink/objects/actors/lead_actor.h> @@ -61,8 +60,7 @@ void HandlerTimerActions::toConsole() { void HandlerTimerActions::handle(Actor *actor) { Handler::handle(actor); - assert(_actions.size()); - if (!actor->isPlaying()){ + if (!actor->isPlaying() && _actions.size()) { Common::RandomSource &rnd = actor->getPage()->getGame()->getRnd(); uint index = rnd.getRandomNumber(_actions.size() - 1); Action *action = actor->findAction(_actions[index]); |