aboutsummaryrefslogtreecommitdiff
path: root/saga/scene.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2005-01-06 16:07:46 +0000
committerTorbjörn Andersson2005-01-06 16:07:46 +0000
commitcfe84492adc3ef69154c59d0a94c093bbb9a6609 (patch)
treede9099a129f066238479a50c249419cda9cdaec9 /saga/scene.cpp
parentf974b48a41469aa3a86a1ed1ccb00d9a58656cc0 (diff)
downloadscummvm-rg350-cfe84492adc3ef69154c59d0a94c093bbb9a6609.tar.gz
scummvm-rg350-cfe84492adc3ef69154c59d0a94c093bbb9a6609.tar.bz2
scummvm-rg350-cfe84492adc3ef69154c59d0a94c093bbb9a6609.zip
Placard functions are now event-driven, so the blocking palette faders are
no longer needed. svn-id: r16450
Diffstat (limited to 'saga/scene.cpp')
-rw-r--r--saga/scene.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/saga/scene.cpp b/saga/scene.cpp
index 00849c894c..1d8527db09 100644
--- a/saga/scene.cpp
+++ b/saga/scene.cpp
@@ -644,7 +644,7 @@ int Scene::loadScene(int scene_num, int load_flag, SCENE_PROC scene_proc, SCENE_
if (_desc.startScriptNum > 0) {
event.type = ONESHOT_EVENT;
event.code = SCRIPT_EVENT;
- event.op = EVENT_BLOCKING;
+ event.op = EVENT_EXEC_BLOCKING;
event.time = 0;
event.param = _desc.startScriptNum;
event.param2 = 0; // Action
@@ -1106,7 +1106,7 @@ int Scene::defaultScene(int param, SCENE_INFO *scene_info) {
if (_desc.sceneScriptNum > 0) {
event.type = ONESHOT_EVENT;
event.code = SCRIPT_EVENT;
- event.op = EVENT_NONBLOCKING;
+ event.op = EVENT_EXEC_NONBLOCKING;
event.time = 0;
event.param = _desc.sceneScriptNum;
event.param2 = 0; // Action