diff options
author | richiesams | 2013-09-02 18:59:42 -0500 |
---|---|---|
committer | richiesams | 2013-09-02 18:59:42 -0500 |
commit | a76f852c385576a84f613489417d71b3ec49b2c6 (patch) | |
tree | 3f7f52be23d789149482989eede672f7c8e188c6 /engines/tsage/blue_force/blueforce_scenes1.cpp | |
parent | c3fcff96124190e847e714fbed23c60c1785c169 (diff) | |
parent | 023783907fa21ec3ac38364ae44d55c813617e27 (diff) | |
download | scummvm-rg350-a76f852c385576a84f613489417d71b3ec49b2c6.tar.gz scummvm-rg350-a76f852c385576a84f613489417d71b3ec49b2c6.tar.bz2 scummvm-rg350-a76f852c385576a84f613489417d71b3ec49b2c6.zip |
Merge branch 'master' into zvision
Diffstat (limited to 'engines/tsage/blue_force/blueforce_scenes1.cpp')
-rw-r--r-- | engines/tsage/blue_force/blueforce_scenes1.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/tsage/blue_force/blueforce_scenes1.cpp b/engines/tsage/blue_force/blueforce_scenes1.cpp index 32d87581c0..d26e34ae23 100644 --- a/engines/tsage/blue_force/blueforce_scenes1.cpp +++ b/engines/tsage/blue_force/blueforce_scenes1.cpp @@ -2649,7 +2649,7 @@ void Scene160::Action2::signal() { } void Scene160::Action2::process(Event &event) { - if ((event.handled) || (event.eventType == 5)) + if ((event.handled) || ((event.eventType != EVENT_BUTTON_DOWN) && (event.eventType != EVENT_KEYPRESS))) return; if (_actionIndex == 25) { |