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

Match disasm., applies to The Dig too.

Browse source 
svn-id: r14167
This commit is contained in:
Travis Howell 2004-07-04 12:06:17 +00:00
parent 11d552ff7e
commit 5b7157e3c9
3 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
scumm/intern.h
View file

@ -682,7 +682,6 @@ protected:
void o8_blastText();
void o8_cursorCommand();
void o8_createBoxMatrix();
void o8_resourceRoutines();
void o8_roomOps();
void o8_actorOps();

11
scumm/script_v6.cpp
View file

@ -1465,7 +1465,18 @@ void ScummEngine_v6::o6_setBoxFlags() {
}
void ScummEngine_v6::o6_createBoxMatrix() {
int i;
Actor *a;
createBoxMatrix();
if ((_gameId == GID_DIG) || (_gameId == GID_CMI)) {
for (i = 1; i < _numActors; i++) {
a = &_actors[i];
if (a && a->isInCurrentRoom())
a->putActor(a->_pos.x, a->_pos.y, _currentRoom);
}
}
}
void ScummEngine_v6::o6_resourceRoutines() {

15
scumm/script_v8.cpp
View file

@ -251,7 +251,7 @@ void ScummEngine_v8::setupOpcodes() {
OPCODE(o6_pickupObject),
OPCODE(o6_setBoxFlags),
/* A8 */
OPCODE(o8_createBoxMatrix),
OPCODE(o6_createBoxMatrix),
OPCODE(o6_invalid),
OPCODE(o8_resourceRoutines),
OPCODE(o8_roomOps),
@ -779,19 +779,6 @@ void ScummEngine_v8::o8_cursorCommand() {
VAR(VAR_USERPUT) = _userPut;
}
void ScummEngine_v8::o8_createBoxMatrix() {
int i;
Actor *a;
createBoxMatrix();
for (i = 1; i < _numActors; i++) {
a = &_actors[i];
if (a && a->isInCurrentRoom())
a->adjustActorPos();
}
}
void ScummEngine_v8::o8_resourceRoutines() {
byte subOp = fetchScriptByte();
int resid = pop();