libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-01 16:35:20 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Slighty modified patch #1704979: "Fix for #1690045: ITE: Item description missing"

Browse Source 
svn-id: r26558
This commit is contained in:
Eugene Sandulenko 2007-04-21 21:29:52 +00:00
parent b1e79b9253
commit 28e721836a
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
engines/saga/script.cpp
View File

@ -479,18 +479,21 @@ void Script::doVerb() {
if (scriptEntrypointNumber > 0) {
event.type = kEvTOneshot;
event.code = kScriptEvent;
event.op = kEventExecNonBlocking;
event.time = 0;
event.param = scriptModuleNumber;
event.param2 = scriptEntrypointNumber;
event.param3 = _pendingVerb; // Action
event.param4 = _pendingObject[0]; // Object
event.param5 = _pendingObject[1]; // With Object
event.param6 = (objectType == kGameObjectActor) ? _pendingObject[0] : ID_PROTAG; // Actor
// WORKAROUND: Fixes bug #1690045 "ITE: Item description missing / ScummVM crash"
if (!(_vm->_scene->currentSceneNumber() == 278 && (_pendingObject[0] == 16419 || _pendingObject[1] == 16419))) {
event.type = kEvTOneshot;
event.code = kScriptEvent;
event.op = kEventExecNonBlocking;
event.time = 0;
event.param = scriptModuleNumber;
event.param2 = scriptEntrypointNumber;
event.param3 = _pendingVerb; // Action
event.param4 = _pendingObject[0]; // Object
event.param5 = _pendingObject[1]; // With Object
event.param6 = (objectType == kGameObjectActor) ? _pendingObject[0] : ID_PROTAG; // Actor
_vm->_events->queue(&event);
_vm->_events->queue(&event);
}
} else {
_vm->getExcuseInfo(_pendingVerb, excuseText, excuseSampleResourceId);