diff options
| -rw-r--r-- | actor.cpp | 3 | ||||
| -rw-r--r-- | script_v1.cpp | 5 | ||||
| -rw-r--r-- | sdl.cpp | 2 |
3 files changed, 6 insertions, 4 deletions
@@ -480,6 +480,9 @@ void Scumm::putActor(Actor * a, int x, int y, byte room) int Scumm::getActorXYPos(Actor * a) { + if (!a) + return -1; + if (a->room != _currentRoom) return -1; _xPos = a->x; diff --git a/script_v1.cpp b/script_v1.cpp index 286f55e947..1d92459a0c 100644 --- a/script_v1.cpp +++ b/script_v1.cpp @@ -2702,11 +2702,10 @@ void Scumm::o5_pickupObjectOld() return; if (whereIsObject(obj) == WIO_INVENTORY) /* Don't take an */ - return; /* object twice */ + return; /* object twice */ // warning("adding %d from %d to inventoryOld", obj, _currentRoom); - addObjectToInventory(obj, _currentRoom); - // warning("added to inventoryOld"); + addObjectToInventory(obj, _currentRoom); removeObjectFromRoom(obj); putOwner(obj, _vars[VAR_EGO]); putClass(obj, 32, 1); @@ -485,7 +485,7 @@ void updateScreen2xSaI(Scumm *s) SDL_Rect *dr; int i; - for (i = 0; i <= numDirtyRects; i++) { + for (i = 0; i < numDirtyRects; i++) { dr = &dirtyRects[i]; Draw2xSaI(dr, s->_videoMode); } |