[Scummvm-cvs-logs] SF.net SVN: scummvm: [21295] scummvm/trunk/engines/scumm/vars.cpp

[fingolfin at users.sourceforge.net]

Revision: 21295
Author:   fingolfin
Date:     2006-03-14 07:25:29 -0800 (Tue, 14 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21295&view=rev

Log Message:
-----------
Merged two consecutive 'if's with identical condition

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/vars.cpp
Modified: scummvm/trunk/engines/scumm/vars.cpp
===================================================================
--- scummvm/trunk/engines/scumm/vars.cpp	2006-03-14 15:18:05 UTC (rev 21294)
+++ scummvm/trunk/engines/scumm/vars.cpp	2006-03-14 15:25:29 UTC (rev 21295)
@@ -91,14 +91,12 @@
 	}
 
 	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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.