diff options
| author | Max Horn | 2003-05-25 00:30:48 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-25 00:30:48 +0000 |
| commit | 54835862fbeccbd17cfb768e2a53d9b13efffa8f (patch) | |
| tree | cf13e69faa7c211ba6b67cfca65f94a48c7ad0d7 | |
| parent | 95b7e01548640629736294d72c3ccc90be1c54e0 (diff) | |
| download | scummvm-rg350-54835862fbeccbd17cfb768e2a53d9b13efffa8f.tar.gz scummvm-rg350-54835862fbeccbd17cfb768e2a53d9b13efffa8f.tar.bz2 scummvm-rg350-54835862fbeccbd17cfb768e2a53d9b13efffa8f.zip | |
cleanup
svn-id: r7920
| -rw-r--r-- | scumm/charset.cpp | 7 | ||||
| -rw-r--r-- | scumm/sound.cpp | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/scumm/charset.cpp b/scumm/charset.cpp index 380a00af61..f7317d064e 100644 --- a/scumm/charset.cpp +++ b/scumm/charset.cpp @@ -574,7 +574,12 @@ void CharsetRendererClassic::printChar(int chr) { 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); } diff --git a/scumm/sound.cpp b/scumm/sound.cpp index d706e350c8..07d79425ac 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -1251,9 +1251,8 @@ int Sound::playBundleSound(char *sound) { 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) { |