From 40fa690de06716055b93f2a0dae49f6d889aa6f6 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Mon, 5 Jul 2004 06:25:01 +0000
Subject: Merge into new function.

svn-id: r14170
---
 scumm/script_v6.cpp | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

(limited to 'scumm/script_v6.cpp')

diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 551de8a685..813fd25709 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -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) {
-- 
cgit v1.2.3