[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.116,1.117 sound.cpp,1.122,1.123 resource_v3.cpp,1.17,1.18 actor.cpp,1.110,1.111

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv29802

Modified Files:
	string.cpp sound.cpp resource_v3.cpp actor.cpp 
Log Message:
don't use _gameDataPath directly; minor cleanup

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- string.cpp	22 May 2003 09:58:33 -0000	1.116
+++ string.cpp	24 May 2003 22:13:00 -0000	1.117
@@ -765,9 +765,9 @@
 	int32 size;
 
 	if (_gameId == GID_DIG) {
-		file.open("language.bnd", _gameDataPath);
+		file.open("language.bnd", getGameDataPath());
 	} else if (_gameId == GID_CMI) {
-		file.open("language.tab", _gameDataPath);
+		file.open("language.tab", getGameDataPath());
 	} else {
 		return;
 	}
@@ -865,7 +865,7 @@
 			if (found != NULL) {
 				File file;
 
-				file.open("language.tab", _gameDataPath);
+				file.open("language.tab", getGameDataPath());
 				if (file.isOpen()) {
 					byte *ptr = trans_buff;
 					byte c;

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- sound.cpp	23 May 2003 18:35:53 -0000	1.122
+++ sound.cpp	24 May 2003 22:13:01 -0000	1.123
@@ -443,7 +443,7 @@
 
 		if (act != 0 && (uint) act < 0x80 && !_scumm->_string[0].no_talk_anim) {
 			a = _scumm->derefActor(act, "processSfxQueues");
-			if (a->room == _scumm->_currentRoom && (finished || !_endOfMouthSync)) {
+			if (a->isInCurrentRoom() && (finished || !_endOfMouthSync)) {
 				b = true;
 				if (!finished)
 					b = isMouthSyncOff(_curSoundPos);

Index: resource_v3.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v3.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- resource_v3.cpp	18 May 2003 21:14:48 -0000	1.17
+++ resource_v3.cpp	24 May 2003 22:13:01 -0000	1.18
@@ -175,7 +175,7 @@
 
 	sprintf(buf, "%02d.LFL", 99 - no);
 	
-	file.open(buf, _gameDataPath);
+	file.open(buf, getGameDataPath());
 		
 	if (file.isOpen() == false) {
 		error("loadCharset(%d): Missing file charset: %s", no, buf);

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- actor.cpp	23 May 2003 13:45:45 -0000	1.110
+++ actor.cpp	24 May 2003 22:13:01 -0000	1.111
@@ -1484,7 +1484,6 @@
 }
 
 void Scumm::resetActorBgs() {
-//	Actor *a;
 	int i, j;
 
 	for (i = 0; i < gdi._numStrips; i++) {