diff options
| author | Max Horn | 2004-01-15 20:37:26 +0000 |
|---|---|---|
| committer | Max Horn | 2004-01-15 20:37:26 +0000 |
| commit | c14e7a02594c1842942108ea8425980638ea9320 (patch) | |
| tree | 4ce4b999d9b14f3d1aaa2c475eff524110341c41 /scumm | |
| parent | ac8243d22919a9da621daef429058d75b504c264 (diff) | |
| download | scummvm-rg350-c14e7a02594c1842942108ea8425980638ea9320.tar.gz scummvm-rg350-c14e7a02594c1842942108ea8425980638ea9320.tar.bz2 scummvm-rg350-c14e7a02594c1842942108ea8425980638ea9320.zip | |
pedantic change
svn-id: r12414
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/imuse_digi/dimuse_sndmgr.cpp | 2 | ||||
| -rw-r--r-- | scumm/script_v6.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scumm/imuse_digi/dimuse_sndmgr.cpp b/scumm/imuse_digi/dimuse_sndmgr.cpp index 0ff6b32be0..e615278401 100644 --- a/scumm/imuse_digi/dimuse_sndmgr.cpp +++ b/scumm/imuse_digi/dimuse_sndmgr.cpp @@ -242,7 +242,7 @@ ImuseDigiSndMgr::soundStruct *ImuseDigiSndMgr::openSound(int32 soundId, const ch } else { error("ImuseDigiSndMgr::openSound() Don't know how load sound: %d", soundId); } - } else if (soundName != NULL) { + } else { if (soundType == IMUSE_BUNDLE) { bool header_outside = ((_vm->_gameId == GID_CMI) && !(_vm->_features & GF_DEMO)); if (soundGroup == IMUSE_VOICE) diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index dc316d271c..e6f8da5f53 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -1226,7 +1226,7 @@ void ScummEngine_v6::o6_getActorRoom() { // if (((VAR_TALK_ACTOR != 0) && (VAR_HAVE_MSG == 1)) && // (getActorRoom(VAR_TALK_ACTOR) == VAR_ROOM)) // Due to the way this is represented in bytecode, the engine cannot - // short circuit. Hence, even thought this would be perfectly fine code + // short circuit. Hence, even though this would be perfectly fine code // in C/C++, here it can (and does) lead to getActorRoom(0) being // invoked. We silently ignore this. push(0); |