From f319865837d2ea2dc4a42f1dc03842e39ddda501 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 14 Mar 2006 15:25:29 +0000 Subject: Merged two consecutive 'if's with identical condition svn-id: r21295 --- engines/scumm/vars.cpp | 8 +++----- 1 file 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 @@ -90,15 +90,13 @@ void ScummEngine::setupScummVars() { VAR_USERPUT = 53; } - 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; -- cgit v1.2.3