[Scummvm-cvs-logs] SF.net SVN: scummvm:[42216] scummvm/trunk/engines/sci

[thebluegr at users.sourceforge.net]

Revision: 42216
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42216&view=rev
Author:   thebluegr
Date:     2009-07-07 12:29:55 +0000 (Tue, 07 Jul 2009)

Log Message:
-----------
Removed the superfluous sci_version_types array (it's essentially the same as the versionNames array)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/console.cpp
    scummvm/trunk/engines/sci/resource.cpp
    scummvm/trunk/engines/sci/resource.h

Modified: scummvm/trunk/engines/sci/console.cpp
===================================================================
--- scummvm/trunk/engines/sci/console.cpp	2009-07-07 12:03:27 UTC (rev 42215)
+++ scummvm/trunk/engines/sci/console.cpp	2009-07-07 12:29:55 UTC (rev 42216)
@@ -374,11 +374,9 @@
 }
 
 bool Console::cmdGetVersion(int argc, const char **argv) {
-	int ver = _vm->getVersion();
+	DebugPrintf("Resource file version:        %s\n", versionNames[_vm->getResMgr()->_sciVersion]);
+	DebugPrintf("Emulated interpreter version: %s\n", versionNames[_vm->getVersion()]);
 
-	DebugPrintf("Resource file version:        %s\n", sci_version_types[_vm->getResMgr()->_sciVersion]);
-	DebugPrintf("Emulated interpreter version: %s\n", versionNames[ver]);
-
 	return true;
 }
 

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2009-07-07 12:03:27 UTC (rev 42215)
+++ scummvm/trunk/engines/sci/resource.cpp	2009-07-07 12:29:55 UTC (rev 42216)
@@ -42,17 +42,6 @@
 
 //#define SCI_VERBOSE_RESMGR 1
 
-const char *sci_version_types[] = {
-	"SCI version undetermined (Autodetect failed / not run)",
-	"SCI version 0.xxx",
-	"SCI version 0.xxx w/ 1.000 compression",
-	"SCI version 1.000 w/ 0.xxx resource.map",
-	"SCI version 1.000 w/ special resource.map",
-	"SCI version 1.000",
-	"SCI version 1.001",
-	"SCI WIN/32"
-};
-
 const int sci_max_resource_nr[] = {65536, 1000, 2048, 2048, 2048, 65536, 65536, 65536};
 
 static const char *sci_error_types[] = {
@@ -484,8 +473,8 @@
 		_mapVersion = detectMapVersion();
 		_volVersion = detectVolVersion();
 	}
-	debug("Using resource map version %d %s", _mapVersion, sci_version_types[_mapVersion]);
-	debug("Using volume version %d %s", _volVersion, sci_version_types[_volVersion]);
+	debug("Using resource map version %d %s", _mapVersion, versionNames[_mapVersion]);
+	debug("Using volume version %d %s", _volVersion, versionNames[_volVersion]);
 
 	scanNewSources();
 	addInternalSources();

Modified: scummvm/trunk/engines/sci/resource.h
===================================================================
--- scummvm/trunk/engines/sci/resource.h	2009-07-07 12:03:27 UTC (rev 42215)
+++ scummvm/trunk/engines/sci/resource.h	2009-07-07 12:29:55 UTC (rev 42216)
@@ -82,10 +82,8 @@
 #define SCI1_RESMAP_ENTRIES_SIZE 6
 #define SCI11_RESMAP_ENTRIES_SIZE 5
 
-extern const char *sci_version_types[];
 extern const int sci_max_resource_nr[]; /**< Highest possible resource numbers */
 
-
 enum ResourceType {
 	kResourceTypeView = 0,
 	kResourceTypePic,


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