diff options
| author | Andrew Kurushin | 2005-05-15 17:45:59 +0000 |
|---|---|---|
| committer | Andrew Kurushin | 2005-05-15 17:45:59 +0000 |
| commit | 1d31cd12233d8a98ea9288147cde946d3884c7c0 (patch) | |
| tree | dbd45e4e5df6fabda14cc0166fa17403c37094a0 /saga/sfuncs.cpp | |
| parent | 2425e657a2dc1a22b3e0502b37fd9e584e3abf51 (diff) | |
| download | scummvm-rg350-1d31cd12233d8a98ea9288147cde946d3884c7c0.tar.gz scummvm-rg350-1d31cd12233d8a98ea9288147cde946d3884c7c0.tar.bz2 scummvm-rg350-1d31cd12233d8a98ea9288147cde946d3884c7c0.zip | |
fixed give verb
fixed occasional verbs redraw
svn-id: r18113
Diffstat (limited to 'saga/sfuncs.cpp')
| -rw-r--r-- | saga/sfuncs.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/saga/sfuncs.cpp b/saga/sfuncs.cpp index 7ff0a1c225..98ac131ae6 100644 --- a/saga/sfuncs.cpp +++ b/saga/sfuncs.cpp @@ -195,10 +195,15 @@ void Script::sfTakeObject(SCRIPTFUNC_PARAMS) { // Check if an object is carried. void Script::sfIsCarried(SCRIPTFUNC_PARAMS) { uint16 objectId = thread->pop(); - ObjectData *obj; - obj = _vm->_actor->getObj(objectId); - - thread->_returnValue = (obj->sceneNumber == ITE_SCENE_INV) ? 1 : 0; + CommonObjectData *object; + if (_vm->_actor->validObjId(objectId)) { + object = _vm->_actor->getObj(objectId); + thread->_returnValue = (object->sceneNumber == ITE_SCENE_INV) ? 1 : 0; + } else { + thread->_returnValue = 0; + } + + } // Script function #4 (0x04) nonblocking |