[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.125,1.126 charset.cpp,2.32,2.33

[Max Horn]

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

Modified Files:
	sound.cpp charset.cpp 
Log Message:
cleanup

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- sound.cpp	25 May 2003 00:04:16 -0000	1.125
+++ sound.cpp	25 May 2003 00:30:48 -0000	1.126
@@ -1251,9 +1251,8 @@
 	free(orig_ptr);
 
 	if (_scumm->_actorToPrintStrFor != 0xFF && _scumm->_actorToPrintStrFor != 0) {
-		Actor *a = _scumm->derefActorSafe(_scumm->_actorToPrintStrFor, "playBundleSound");
-		if (a)
-			rate = (rate * a->talkFrequency) / 256;
+		Actor *a = _scumm->derefActor(_scumm->_actorToPrintStrFor, "playBundleSound");
+		rate = (rate * a->talkFrequency) / 256;
 	}
 	
 	if (bits == 8) {

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.32
retrieving revision 2.33
diff -u -d -r2.32 -r2.33
--- charset.cpp	21 May 2003 16:28:00 -0000	2.32
+++ charset.cpp	25 May 2003 00:30:48 -0000	2.33
@@ -574,7 +574,12 @@
 
 		drawBits(vs, dst, mask, drawTop, width, height);
 
-		_vm->blit(back, dst, width, height);
+		int h = height;
+		do {
+			memcpy(back, dst, width);
+			back += _vm->_screenWidth;
+			dst += _vm->_screenWidth;
+		} while (--h);
 	} else {
 		drawBits(vs, dst, mask, drawTop, width, height);
 	}