libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 17:33:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added Zak256/Indy3 walkbox locking support.

Browse Source 
svn-id: r3874
This commit is contained in:
James Brown 2002-04-05 08:13:53 +00:00
parent 4a3f14b2f7
commit 5c8e3d8453
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
script_v1.cpp
View File

@ -816,6 +816,7 @@ void Scumm::o5_actorSetClass() {
_classData[act] = 0; _classData[act] = 0;
continue; continue;
} }
if(_features & GF_SMALL_HEADER) { if(_features & GF_SMALL_HEADER) {
oldClassData=(byte*)&_classData[act]; oldClassData=(byte*)&_classData[act];
if (newClass&0x80) if (newClass&0x80)
@ -1340,9 +1341,11 @@ void Scumm::o5_ifClassOfIs() {
byte *oldClass; byte *oldClass;
act = getVarOrDirectWord(0x80); act = getVarOrDirectWord(0x80);
while ( (_opcode = fetchScriptByte()) != 0xFF) { while ( (_opcode = fetchScriptByte()) != 0xFF) {
cls = getVarOrDirectWord(0x80); cls = getVarOrDirectWord(0x80);
oldClass = (byte*)&_classData[act]; oldClass = (byte*)&_classData[act];
if(_features & GF_SMALL_HEADER) if(_features & GF_SMALL_HEADER)
b = oldClass[((cls-1)&0x7f)/8] & bit_table[((cls-1)&0x07)]; b = oldClass[((cls-1)&0x7f)/8] & bit_table[((cls-1)&0x07)];
else else
@ -1497,10 +1500,14 @@ void Scumm::o5_loadRoomWithEgo() {
void Scumm::o5_matrixOps() { void Scumm::o5_matrixOps() {
int a,b; int a,b;
if(_features & GF_OLD256) { /* FIXME: missing function call*/
warning("o5_matrixOps - unimplemented on GF_OLD256"); if(_features & GF_OLD256) {
a=getVarOrDirectByte(0x80); a = getVarOrDirectByte(0x80);
b=fetchScriptByte(); b = fetchScriptByte();
if (b == 0x40) // Lock Box
setBoxFlags(a, 0x80);
else
setBoxFlags(a, 0);
return; return;
} }
@ -2342,10 +2349,8 @@ void Scumm::o5_walkActorToActor() {
int b,x,y; int b,x,y;
Actor *a, *a2; Actor *a, *a2;
int nr; int nr;
int nr2 = getVarOrDirectByte(0x80);
warning("walk actor to actor"); a = derefActorSafe(nr2, "o5_walkActorToActor");
a = derefActorSafe(getVarOrDirectByte(0x80), "o5_walkActorToActor");
if (a->room != _currentRoom) { if (a->room != _currentRoom) {
getVarOrDirectByte(0x40); getVarOrDirectByte(0x40);
fetchScriptByte(); fetchScriptByte();
@ -2358,7 +2363,7 @@ void Scumm::o5_walkActorToActor() {
fetchScriptByte(); fetchScriptByte();
return; return;
} }
// warning("walk actor %d to actor %d", nr, nr2);
a2 = derefActorSafe(nr, "o5_walkActorToActor(2)"); a2 = derefActorSafe(nr, "o5_walkActorToActor(2)");
if (a2->room != _currentRoom) { if (a2->room != _currentRoom) {
fetchScriptByte(); fetchScriptByte();
@ -2514,11 +2519,13 @@ void Scumm::o5_oldRoomEffect() {
void Scumm::o5_pickupObjectOld() { void Scumm::o5_pickupObjectOld() {
int obj = getVarOrDirectWord(0x80); int obj = getVarOrDirectWord(0x80);
if(getObjectIndex(obj) == -1) if(getObjectIndex(obj) == -1)
return; return;
// warning("adding %d from %d to inventoryOld", obj, _currentRoom);
addObjectToInventory(obj,_currentRoom); addObjectToInventory(obj,_currentRoom);
// warning("added to inventoryOld");
removeObjectFromRoom(obj); removeObjectFromRoom(obj);
putOwner(obj, _vars[VAR_EGO]); putOwner(obj, _vars[VAR_EGO]);
putClass(obj, 32, 1); putClass(obj, 32, 1);