[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.183,2.184 scumm.cpp,1.134,1.135

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5281/scumm

Modified Files:
	intern.h scumm.cpp 
Log Message:

Switch to case


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.183
retrieving revision 2.184
diff -u -d -r2.183 -r2.184
--- intern.h	23 Aug 2004 10:46:00 -0000	2.183
+++ intern.h	23 Aug 2004 10:52:10 -0000	2.184
@@ -654,8 +654,6 @@
 	virtual void executeOpcode(byte i);
 	virtual const char *getOpcodeDesc(byte i);
 
-	byte stringLen(byte *);
-
 	/* Version 7 script opcodes */
 	void o7_getString();
 	void o7_objectX();

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- scumm.cpp	23 Aug 2004 10:37:29 -0000	1.134
+++ scumm.cpp	23 Aug 2004 10:52:10 -0000	1.135
@@ -3255,17 +3255,20 @@
 		engine = new ScummEngine_v5(detector, syst, game);
 		break;
 	case 6:
-		if (game.heversion >= 60) {
-			// TODO: probably use another variable with version number
+		switch (game.heversion) {
 #ifndef __PALM_OS__
-			if (game.heversion >= 72)
-				engine = new ScummEngine_v72he(detector, syst, game);
-			else if (game.heversion >= 70)
-				engine = new ScummEngine_v7he(detector, syst, game);
-			else
+		case 72:
+			engine = new ScummEngine_v72he(detector, syst, game);
+			break;
+		case 71:
+		case 70:
+			engine = new ScummEngine_v7he(detector, syst, game);
+			break;
 #endif
-				engine = new ScummEngine_v6he(detector, syst, game);
-		} else {
+		case 60:
+			engine = new ScummEngine_v6he(detector, syst, game);
+			break;
+		default:
 			engine = new ScummEngine_v6(detector, syst, game);
 		}
 		break;