RCS file: /cvsroot/scummvm/scummvm/object.cpp,v
retrieving revision 1.13
diff -u -r1.13 object.cpp
|
|
|
109 | 109 | return getActorXYPos(derefActorSafe(object, "getObjectOrActorXY")); |
110 | 110 | } |
111 | 111 | switch(whereIsObject(object)) { |
112 | | case -1: |
| 112 | case objectNotFound: |
113 | 113 | return -1; |
114 | | case 0: |
| 114 | case objectInInventory: |
115 | 115 | return getActorXYPos(derefActorSafe(_objectFlagTable[object]&0xF,"getObjectOrActorXY(2)")); |
116 | 116 | } |
117 | 117 | getObjectXYPos(object); |
… |
… |
|
453 | 453 | for (i=1; i<_maxInventoryItems; i++) { |
454 | 454 | if (_inventory[i] == obj) { |
455 | 455 | j = whereIsObject(obj); |
456 | | if (j==0) { |
| 456 | if (j==objectInInventory) { |
457 | 457 | nukeResource(rtInventory, i); |
458 | 458 | _inventory[i] = 0; |
459 | 459 | } |
… |
… |
|
563 | 563 | |
564 | 564 | CHECK_HEAP |
565 | 565 | |
566 | | if (whereIsObject(obj)==4) { |
| 566 | if (whereIsObject(obj)==objectFlObjectInRoom) { |
567 | 567 | i = getObjectIndex(obj); |
568 | 568 | ptr = getResourceAddress(rtFlObject, _objs[i].fl_object_index) + 64; |
569 | 569 | size = READ_BE_UINT32_UNALIGNED(ptr+4); |
… |
… |
|
634 | 634 | if (obj <= _vars[VAR_NUM_ACTOR]) { |
635 | 635 | return derefActorSafe(obj,"getObjX")->x; |
636 | 636 | } else { |
637 | | if (whereIsObject(obj)==-1) |
| 637 | if (whereIsObject(obj)==objectNotFound) |
638 | 638 | return -1; |
639 | 639 | getObjectOrActorXY(obj); |
640 | 640 | return _xPos; |
… |
… |
|
645 | 645 | if (obj <= _vars[VAR_NUM_ACTOR]) { |
646 | 646 | return derefActorSafe(obj,"getObjY")->y; |
647 | 647 | } else { |
648 | | if (whereIsObject(obj)==-1) |
| 648 | if (whereIsObject(obj)==objectNotFound) |
649 | 649 | return -1; |
650 | 650 | getObjectOrActorXY(obj); |
651 | 651 | return _yPos; |
RCS file: /cvsroot/scummvm/scummvm/script.cpp,v
retrieving revision 1.10
diff -u -r1.10 script.cpp
|
|
|
645 | 645 | |
646 | 646 | where = whereIsObject(object); |
647 | 647 | |
648 | | if (where == -1) { |
| 648 | if (where == objectNotFound) { |
649 | 649 | error("Code for object %d not in room %d", object, _roomResource); |
650 | 650 | } |
651 | 651 | |
… |
… |
|
685 | 685 | byte *objptr, *verbptr; |
686 | 686 | int verboffs; |
687 | 687 | |
688 | | if (whereIsObject(obj)==-1) |
| 688 | if (whereIsObject(obj)==objectNotFound) |
689 | 689 | return 0; |
690 | 690 | |
691 | 691 | objptr = getObjectAddress(obj); |
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.11
diff -u -r1.11 script_v1.cpp
|
|
|
1201 | 1201 | |
1202 | 1202 | a = derefActorSafe(getVarOrDirectByte(0x80), "o5_putActorAtObject"); |
1203 | 1203 | obj = getVarOrDirectWord(0x40); |
1204 | | if (whereIsObject(obj)!=-1) |
| 1204 | if (whereIsObject(obj)!=objectNotFound) |
1205 | 1205 | getObjectXYPos(obj); |
1206 | 1206 | else { |
1207 | 1207 | _xPos = 240; |
… |
… |
|
1884 | 1884 | |
1885 | 1885 | a = derefActorSafe(getVarOrDirectByte(0x80), "o5_walkActorToObject"); |
1886 | 1886 | obj = getVarOrDirectWord(0x40); |
1887 | | if (whereIsObject(obj)!=-1) { |
| 1887 | if (whereIsObject(obj)!=objectNotFound) { |
1888 | 1888 | getObjectXYPos(obj); |
1889 | 1889 | startWalkActor(a, _xPos, _yPos, _dir); |
1890 | 1890 | } |
RCS file: /cvsroot/scummvm/scummvm/script_v2.cpp,v
retrieving revision 1.9
diff -u -r1.9 script_v2.cpp
|
|
|
852 | 852 | a = derefActorSafe(pop(), "o6_walkActorToObj"); |
853 | 853 | |
854 | 854 | if (obj >= 17) { |
855 | | if (whereIsObject(obj)==-1) |
| 855 | if (whereIsObject(obj)==objectNotFound) |
856 | 856 | return; |
857 | 857 | getObjectXYPos(obj); |
858 | 858 | startWalkActor(a, _xPos, _yPos, _dir); |
… |
… |
|
909 | 909 | obj = pop(); |
910 | 910 | |
911 | 911 | a = derefActorSafe(pop(), "o6_putActorAtObject"); |
912 | | if (whereIsObject(obj)!=-1) { |
| 912 | if (whereIsObject(obj)!=objectNotFound) { |
913 | 913 | getObjectXYPos(obj); |
914 | 914 | x = _xPos; |
915 | 915 | y = _yPos; |
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.25
diff -u -r1.25 scumm.h
|
|
|
325 | 325 | |
326 | 326 | }; |
327 | 327 | |
| 328 | enum ObjectLocation { |
| 329 | objectNotFound = -1, |
| 330 | objectInInventory = 0, |
| 331 | objectInRoom = 1, |
| 332 | objectFlObjectInRoom = 4 |
| 333 | }; |
| 334 | |
328 | 335 | #define _maxRooms res.num[rtRoom] |
329 | 336 | #define _maxScripts res.num[rtScript] |
330 | 337 | #define _maxCostumes res.num[rtCostume] |
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.24
diff -u -r1.24 scummvm.cpp
|
|
|
543 | 543 | memset(actorDrawBits, 0, sizeof(actorDrawBits)); |
544 | 544 | |
545 | 545 | if (a) { |
546 | | if (whereIsObject(objectNr)!=1 && |
547 | | whereIsObject(objectNr)!=4) |
| 546 | if (whereIsObject(objectNr)!=objectInRoom && |
| 547 | whereIsObject(objectNr)!=objectFlObjectInRoom) |
548 | 548 | error("startScene: Object %d is not in room %d", objectNr, _currentRoom); |
549 | 549 | getObjectXYPos(objectNr); |
550 | 550 | putActor(a, _xPos, _yPos, _currentRoom); |
RCS file: /cvsroot/scummvm/scummvm/verbs.cpp,v
retrieving revision 1.8
diff -u -r1.8 verbs.cpp
|
|
|
250 | 250 | ImageHeader *imhd; |
251 | 251 | RoomHeader *roomhdr; |
252 | 252 | |
253 | | if (whereIsObject(object) == 4) |
| 253 | if (whereIsObject(object) == objectFlObjectInRoom) |
254 | 254 | error("Can't grab verb image from flobject"); |
255 | 255 | |
256 | 256 | ensureResourceLoaded(rtRoom,room); |