diff options
| author | James Brown | 2002-07-30 11:43:30 +0000 |
|---|---|---|
| committer | James Brown | 2002-07-30 11:43:30 +0000 |
| commit | 9fa757bca3cb767d66006e8480ef964564c881e7 (patch) | |
| tree | b9cde78115f71dc1ed7dc172fb5c88af644e23a5 /object.cpp | |
| parent | f2265feadfc888e5f380a4e4503cb537d2f21dd1 (diff) | |
| download | scummvm-rg350-9fa757bca3cb767d66006e8480ef964564c881e7.tar.gz scummvm-rg350-9fa757bca3cb767d66006e8480ef964564c881e7.tar.bz2 scummvm-rg350-9fa757bca3cb767d66006e8480ef964564c881e7.zip | |
Fix for 588446 (Zak256: squirrel cave crash)
svn-id: r4680
Diffstat (limited to 'object.cpp')
| -rw-r--r-- | object.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/object.cpp b/object.cpp index b0aa12687c..319328c0ee 100644 --- a/object.cpp +++ b/object.cpp @@ -143,8 +143,13 @@ int Scumm::whereIsObject(int object) int Scumm::getObjectOrActorXY(int object, int &x, int &y) { - if (object < NUM_ACTORS) - return derefActorSafe(object, "getObjectOrActorXY")->getActorXYPos(x, y); + if (object < NUM_ACTORS) { + Actor *act = derefActorSafe(object, "getObjectOrActorXY"); + if (!act) + return 0; + else + return act->getActorXYPos(x, y); + } switch (whereIsObject(object)) { case WIO_NOT_FOUND: |