thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source 
svn-id: r17615
This commit is contained in:
Travis Howell 2005-04-16 10:26:49 +00:00
parent 57711d54fe
commit 43aab9eabb
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
scumm/script_v6.cpp
View file

@ -386,7 +386,7 @@ const char *ScummEngine_v6::getOpcodeDesc(byte i) {
int ScummEngine_v6::popRoomAndObj(int *room) { int ScummEngine_v6::popRoomAndObj(int *room) {
int obj; int obj;
if (_version >= 7 || _heversion >= 70) { if (_version >= 7) {
obj = pop(); obj = pop();
*room = getObjectRoom(obj); *room = getObjectRoom(obj);
} else { } else {
@ -986,7 +986,13 @@ void ScummEngine_v6::o6_cursorCommand() {
break; break;
case 0x99: // SO_CURSOR_IMAGE Set cursor image case 0x99: // SO_CURSOR_IMAGE Set cursor image
{ {
int room, obj = popRoomAndObj(&room); int room, obj;
if (_heversion >= 70) {
obj = pop();
room = getObjectRoom(obj);
} else {
obj = popRoomAndObj(&room);
}
setCursorFromImg(obj, room, 1); setCursorFromImg(obj, room, 1);
break; break;
} }
@ -1239,11 +1245,7 @@ void ScummEngine_v6::o6_putActorAtObject() {
int room, obj, x, y; int room, obj, x, y;
Actor *a; Actor *a;
if (_features & GF_HUMONGOUS) { obj = popRoomAndObj(&room);
room = pop();
obj = pop();
} else
obj = popRoomAndObj(&room);
a = derefActor(pop(), "o6_putActorAtObject"); a = derefActor(pop(), "o6_putActorAtObject");
if (whereIsObject(obj) != WIO_NOT_FOUND) { if (whereIsObject(obj) != WIO_NOT_FOUND) {
@ -1323,11 +1325,7 @@ void ScummEngine_v6::o6_loadRoomWithEgo() {
y = pop(); y = pop();
x = pop(); x = pop();
if (_features & GF_HUMONGOUS) { obj = popRoomAndObj(&room);
room = pop();
obj = pop();
} else
obj = popRoomAndObj(&room);
a = derefActor(VAR(VAR_EGO), "o6_loadRoomWithEgo"); a = derefActor(VAR(VAR_EGO), "o6_loadRoomWithEgo");
a->putActor(0, 0, room); a->putActor(0, 0, room);

3
scumm/script_v7he.cpp
View file

@ -599,7 +599,8 @@ void ScummEngine_v70he::o70_resourceRoutines() {
break; break;
case 119: // SO_LOAD_OBJECT case 119: // SO_LOAD_OBJECT
{ {
int room, obj = popRoomAndObj(&room); int obj = pop();
int room = getObjectRoom(obj);
loadFlObject(obj, room); loadFlObject(obj, room);
break; break;
} }