[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.250,1.251 script_v6.cpp,1.351,1.352 scumm.h,1.423,1.424

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9004/scumm

Modified Files:
	actor.cpp script_v6.cpp scumm.h 
Log Message:

Merge into new function.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -d -r1.250 -r1.251
--- actor.cpp	4 Jul 2004 03:25:24 -0000	1.250
+++ actor.cpp	5 Jul 2004 06:25:01 -0000	1.251
@@ -806,6 +806,17 @@
 		VAR(VAR_TALK_ACTOR) = value;
 }
 
+void ScummEngine::putActors() {
+	Actor *a;
+	int i;
+
+	for (i = 1; i < _numActors; i++) {
+		a = &_actors[i];
+		if (a && a->isInCurrentRoom())
+			a->putActor(a->_pos.x, a->_pos.y, a->room);
+	}
+}
+
 void ScummEngine::showActors() {
 	int i;
 

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -d -r1.351 -r1.352
--- script_v6.cpp	5 Jul 2004 06:02:05 -0000	1.351
+++ script_v6.cpp	5 Jul 2004 06:25:01 -0000	1.352
@@ -1465,18 +1465,9 @@
 }
 
 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 @@
 	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) {

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -d -r1.423 -r1.424
--- scumm.h	4 Jul 2004 06:14:17 -0000	1.423
+++ scumm.h	5 Jul 2004 06:25:01 -0000	1.424
@@ -794,6 +794,7 @@
 	void walkActors();
 	void playActorSounds();
 	void setActorRedrawFlags();
+	void putActors();
 	void showActors();
 	void resetActorBgs();
 	void processActors();