diff -ur ScummVM-cvs20030224/scummvm/scumm/script_v6.cpp ScummVM-cvs20030224+hack/scummvm/scumm/script_v6.cpp
old
|
new
|
|
1124 | 1124 | obj = popRoomAndObj(&room); |
1125 | 1125 | |
1126 | 1126 | 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 | |
1127 | 1133 | if (whereIsObject(obj) != WIO_NOT_FOUND) { |
1128 | 1134 | getObjectXYPos(obj, x, y); |
1129 | 1135 | } else { |
1130 | 1136 | x = (_realWidth / 2); |
1131 | 1137 | y = 120; |
1132 | 1138 | } |
1133 | | if (room == 0xFF) |
1134 | | room = a->room; |
1135 | 1139 | a->putActor(x, y, room); |
1136 | 1140 | } |
1137 | 1141 | |