diff options
| author | James Brown | 2002-03-16 05:33:25 +0000 |
|---|---|---|
| committer | James Brown | 2002-03-16 05:33:25 +0000 |
| commit | 3308d6b9dac03cc16e2e18212809fa2f45010f5f (patch) | |
| tree | 49bf5b9a5bc014f2d0dabae19b6b48549bf9fdd2 /object.cpp | |
| parent | 829bad142c2757a7025c292055bd769dd87f2995 (diff) | |
| download | scummvm-rg350-3308d6b9dac03cc16e2e18212809fa2f45010f5f.tar.gz scummvm-rg350-3308d6b9dac03cc16e2e18212809fa2f45010f5f.tar.bz2 scummvm-rg350-3308d6b9dac03cc16e2e18212809fa2f45010f5f.zip | |
Lots of stuff - GUI fixes. More launcher work... and CD music working in MI1. Thanks to frob and realmz for their work on that.
svn-id: r3762
Diffstat (limited to 'object.cpp')
| -rw-r--r-- | object.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/object.cpp b/object.cpp index 5c93f0f9d2..e2d19386e4 100644 --- a/object.cpp +++ b/object.cpp @@ -672,7 +672,8 @@ byte *Scumm::getObjOrActorName(int obj) { byte offset; objptr = getOBCDFromObject(obj); - offset = *(objptr+18); + if (objptr) + offset = *(objptr+18); return(objptr+offset); } @@ -901,7 +902,7 @@ void Scumm::setOwnerOf(int obj, int owner) { int Scumm::getObjX(int obj) { if (obj < NUM_ACTORS) { - if (obj==0) + if (obj<1) return 0; /* fix for indy4's map */ return derefActorSafe(obj,"getObjX")->x; } else { @@ -914,7 +915,7 @@ int Scumm::getObjX(int obj) { int Scumm::getObjY(int obj) { if (obj < NUM_ACTORS) { - if (obj==0) + if (obj<1) return 0; /* fix for indy4's map */ return derefActorSafe(obj,"getObjY")->y; } else { |