aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2006-03-14 15:25:29 +0000
committerMax Horn2006-03-14 15:25:29 +0000
commitf319865837d2ea2dc4a42f1dc03842e39ddda501 (patch)
tree2c52c2c9715b7b102c23e7369f56da9d9f56b402
parentfa4471fae40546b54c6a338705fd0388871e9e87 (diff)
downloadscummvm-rg350-f319865837d2ea2dc4a42f1dc03842e39ddda501.tar.gz
scummvm-rg350-f319865837d2ea2dc4a42f1dc03842e39ddda501.tar.bz2
scummvm-rg350-f319865837d2ea2dc4a42f1dc03842e39ddda501.zip
Merged two consecutive 'if's with identical condition
svn-id: r21295
-rw-r--r--engines/scumm/vars.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp
index b47332c60d..da713d72f5 100644
--- a/engines/scumm/vars.cpp
+++ b/engines/scumm/vars.cpp
@@ -91,14 +91,12 @@ void ScummEngine::setupScummVars() {
}
if (_game.version >= 5) {
- VAR_SOUNDPARAM = 64;
- VAR_SOUNDPARAM2 = 65;
- VAR_SOUNDPARAM3 = 66;
- }
- if (_game.version >= 5) {
VAR_SOUNDRESULT = 56;
VAR_TALKSTOP_KEY = 57;
VAR_FADE_DELAY = 59;
+ VAR_SOUNDPARAM = 64;
+ VAR_SOUNDPARAM2 = 65;
+ VAR_SOUNDPARAM3 = 66;
VAR_MOUSEPRESENT = 67;
VAR_MEMORY_PERFORMANCE = 68;
VAR_VIDEO_PERFORMANCE = 69;