aboutsummaryrefslogtreecommitdiff
path: root/scumm/sound.cpp
diff options
context:
space:
mode:
authorMax Horn2003-05-23 13:24:41 +0000
committerMax Horn2003-05-23 13:24:41 +0000
commitc333b6d6ecb062ec18a36c09ef94c1098b38905d (patch)
tree21f2d4e3981aeba904493cb76aee6f55c0b42e16 /scumm/sound.cpp
parent28eade1da4e1811a230feb6c30d3abcf31deb0c2 (diff)
downloadscummvm-rg350-c333b6d6ecb062ec18a36c09ef94c1098b38905d.tar.gz
scummvm-rg350-c333b6d6ecb062ec18a36c09ef94c1098b38905d.tar.bz2
scummvm-rg350-c333b6d6ecb062ec18a36c09ef94c1098b38905d.zip
replaced many unsafe uses of derefActorSafe by derefActor; replaced derefActorSafe/assert pairs by derefActor (gives better error message); replaced various derefActorSafe/if(a!=0) pairs by derefActor (in cases where the deref should never fail, ever, except due to a bug in ScummVM)
svn-id: r7859
Diffstat (limited to 'scumm/sound.cpp')
-rw-r--r--scumm/sound.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 8520e31c83..bc0bbcb9bb 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -489,7 +489,7 @@ void Sound::processSfxQueues() {
if (act != 0 && (uint) act < 0x80 && !_scumm->_string[0].no_talk_anim) {
- a = _scumm->derefActorSafe(act, "processSfxQueues");
+ a = _scumm->derefActor(act, "processSfxQueues");
if (a->room == _scumm->_currentRoom && (finished || !_endOfMouthSync)) {
b = true;
if (!finished)