aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2013-08-18 09:07:49 +0200
committerTorbjörn Andersson2013-08-18 09:07:49 +0200
commite81d8d8112a1dc7e81bcd7eff5b2b601f64cfd75 (patch)
treef327f295da9f4f2b1fcf8abe5d914ae65879a3e0
parentb8c198aec9ab92f22b8ddce0bf0049501e14fb62 (diff)
downloadscummvm-rg350-e81d8d8112a1dc7e81bcd7eff5b2b601f64cfd75.tar.gz
scummvm-rg350-e81d8d8112a1dc7e81bcd7eff5b2b601f64cfd75.tar.bz2
scummvm-rg350-e81d8d8112a1dc7e81bcd7eff5b2b601f64cfd75.zip
SCUMM: Remove unnecessary NULL check, CID 1003629
Since _actors[i]->_sound is an array, it can't ever be NULL.
-rw-r--r--engines/scumm/actor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 5c148a7b57..4e14473921 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -1485,7 +1485,7 @@ void ScummEngine::playActorSounds() {
int sound;
for (i = 1; i < _numActors; i++) {
- if (_actors[i]->_cost.soundCounter && _actors[i]->isInCurrentRoom() && _actors[i]->_sound) {
+ if (_actors[i]->_cost.soundCounter && _actors[i]->isInCurrentRoom()) {
_currentScript = 0xFF;
if (_game.version == 0) {
sound = v0ActorSounds[i - 1] & 0x3F;