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

Merge into new function.

Browse source 
svn-id: r14170
This commit is contained in:
Travis Howell 2004-07-05 06:25:01 +00:00
parent 510d9c847f
commit 40fa690de0
3 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

22
scumm/script_v6.cpp
View file

@ -1465,18 +1465,9 @@ 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);
}
}
putActors();
}
void ScummEngine_v6::o6_resourceRoutines() {
@ -3145,15 +3136,8 @@ void ScummEngine_v6::o6_setBoxSet() {
assert(matrix);
memcpy(matrix, boxm, mboxSize);
if (_version == 7) {
Actor *a;
for (i = 1; i < _numActors; i++) {
a = &_actors[i];
if (a && a->isInCurrentRoom())
a->putActor(a->_pos.x, a->_pos.y, _currentRoom);
}
}
if (_version == 7)
putActors();
}
void ScummEngine_v6::decodeParseString(int m, int n) {