diff options
Diffstat (limited to 'engines/saga/sfuncs.cpp')
-rw-r--r-- | engines/saga/sfuncs.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/saga/sfuncs.cpp b/engines/saga/sfuncs.cpp index 463adc76e8..1e34362dc4 100644 --- a/engines/saga/sfuncs.cpp +++ b/engines/saga/sfuncs.cpp @@ -327,7 +327,7 @@ void Script::sfScriptDoAction(SCRIPTFUNC_PARAMS) { event.param4 = theObject; // Object event.param5 = withObject; // With Object event.param6 = objectId; - _vm->_events->queue(&event); + _vm->_events->queue(event); } // Script function #8 (0x08) nonblocking @@ -1060,7 +1060,7 @@ void Script::sfPlacard(SCRIPTFUNC_PARAMS) { static PalEntry cur_pal[PAL_ENTRIES]; PalEntry *pal; Event event; - Event *q_event; + EventColumns *eventColumns; thread->wait(kWaitTypePlacard); @@ -1070,7 +1070,7 @@ void Script::sfPlacard(SCRIPTFUNC_PARAMS) { event.type = kEvTOneshot; event.code = kCursorEvent; event.op = kEventHide; - q_event = _vm->_events->queue(&event); + eventColumns = _vm->_events->queue(event); _vm->_interface->setFadeMode(kFadeOut); @@ -1082,7 +1082,7 @@ void Script::sfPlacard(SCRIPTFUNC_PARAMS) { event.time = 0; event.duration = kNormalFadeDuration; event.data = cur_pal; - q_event = _vm->_events->chain(q_event, &event); + _vm->_events->chain(eventColumns, event); // set fade mode event.type = kEvTImmediate; @@ -1091,12 +1091,12 @@ void Script::sfPlacard(SCRIPTFUNC_PARAMS) { event.param = kNoFade; event.time = 0; event.duration = 0; - q_event = _vm->_events->chain(q_event, &event); + _vm->_events->chain(eventColumns, event); event.type = kEvTOneshot; event.code = kInterfaceEvent; event.op = kEventClearStatus; - q_event = _vm->_events->chain(q_event, &event); + _vm->_events->chain(eventColumns, event); event.type = kEvTOneshot; event.code = kGraphicsEvent; @@ -1106,7 +1106,7 @@ void Script::sfPlacard(SCRIPTFUNC_PARAMS) { event.param3 = _vm->_scene->getHeight(); event.param4 = 0; event.param5 = _vm->getDisplayInfo().width; - q_event = _vm->_events->chain(q_event, &event); + _vm->_events->chain(eventColumns, event); // Put the text in the center of the viewport, assuming it will fit on // one line. If we cannot make that assumption we'll need to extend @@ -1130,7 +1130,7 @@ void Script::sfPlacard(SCRIPTFUNC_PARAMS) { event.code = kTextEvent; event.op = kEventDisplay; event.data = _placardTextEntry; - q_event = _vm->_events->chain(q_event, &event); + _vm->_events->chain(eventColumns, event); _vm->_scene->getBGPal(pal); event.type = kEvTImmediate; @@ -1139,13 +1139,13 @@ void Script::sfPlacard(SCRIPTFUNC_PARAMS) { event.time = 0; event.duration = kNormalFadeDuration; event.data = pal; - q_event = _vm->_events->chain(q_event, &event); + _vm->_events->chain(eventColumns, event); event.type = kEvTOneshot; event.code = kScriptEvent; event.op = kEventThreadWake; event.param = kWaitTypePlacard; - q_event = _vm->_events->chain(q_event, &event); + _vm->_events->chain(eventColumns, event); } |