Ticket #8179: cmi-actor-placement.diff

File cmi-actor-placement.diff, 697 bytes (added by eriktorbjorn, 17 years ago)

Patch against a February 24 CVS snapshot

  • scummvm/scumm/script_v6.cpp

    diff -ur ScummVM-cvs20030224/scummvm/scumm/script_v6.cpp ScummVM-cvs20030224+hack/scummvm/scumm/script_v6.cpp
    old new  
    11241124        obj = popRoomAndObj(&room);
    11251125
    11261126        a = derefActorSafe(pop(), "o6_putActorAtObject");
     1127
     1128        if (room == 0xFF)
     1129                room = a->room;
     1130        else if (room != a->room)
     1131                startScene(room, a, obj);
     1132
    11271133        if (whereIsObject(obj) != WIO_NOT_FOUND) {
    11281134                getObjectXYPos(obj, x, y);
    11291135        } else {
    11301136                x = (_realWidth / 2);
    11311137                y = 120;
    11321138        }
    1133         if (room == 0xFF)
    1134                 room = a->room;
    11351139        a->putActor(x, y, room);
    11361140}
    11371141