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

[fingolfin at users.sourceforge.net]

Revision: 22715
Author:   fingolfin
Date:     2006-05-28 05:12:30 -0700 (Sun, 28 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22715&view=rev

Log Message:
-----------
No need to compute the SCUMM version here; rather, verify that the SCUMM version is already set correctly

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/resource_v2.cpp
Modified: scummvm/trunk/engines/scumm/resource_v2.cpp
===================================================================
--- scummvm/trunk/engines/scumm/resource_v2.cpp	2006-05-28 12:10:11 UTC (rev 22714)
+++ scummvm/trunk/engines/scumm/resource_v2.cpp	2006-05-28 12:12:30 UTC (rev 22715)
@@ -174,23 +174,24 @@
 	switch (magic) {
 		case 0x0100:
 			printf("Enhanced V2 game detected\n");
+			assert(_game.version == 2);
 			readEnhancedIndexFile();
 			break;
 		case 0x0A31:
 			printf("Classic V1 game detected\n");
-			_game.version = 1;
+			assert(_game.version == 1);
 			readClassicIndexFile();
 			break;
 		case 0x4643:
 			if (!(_game.platform == Common::kPlatformNES))
 				error("Use maniac target");
 			printf("NES V1 game detected\n");
-			_game.version = 1;
+			assert(_game.version == 1);
 			readClassicIndexFile();
 			break;
 		case 0x132:
 			printf("C64 V1 game detected\n");
-			_game.version = 1;
+			assert(_game.version == 1);
 			readClassicIndexFile();
 			break;
 		default:


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