From 74670cc834636b431b168343511415ccbcc97a71 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 7 Jul 2009 12:29:55 +0000
Subject: Removed the superfluous sci_version_types array (it's essentially the
 same as the versionNames array)

svn-id: r42216
---
 engines/sci/console.cpp  |  6 ++----
 engines/sci/resource.cpp | 15 ++-------------
 engines/sci/resource.h   |  2 --
 3 files changed, 4 insertions(+), 19 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 8f977c04c2..2d11f39835 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -374,10 +374,8 @@ const char *selector_name(EngineState *s, int selector) {
 }
 
 bool Console::cmdGetVersion(int argc, const char **argv) {
-	int ver = _vm->getVersion();
-
-	DebugPrintf("Resource file version:        %s\n", sci_version_types[_vm->getResMgr()->_sciVersion]);
-	DebugPrintf("Emulated interpreter version: %s\n", versionNames[ver]);
+	DebugPrintf("Resource file version:        %s\n", versionNames[_vm->getResMgr()->_sciVersion]);
+	DebugPrintf("Emulated interpreter version: %s\n", versionNames[_vm->getVersion()]);
 
 	return true;
 }
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index fee0822f84..b66c5de092 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -42,17 +42,6 @@ namespace Sci {
 
 //#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 @@ ResourceManager::ResourceManager(int version, int maxMemory) {
 		_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();
diff --git a/engines/sci/resource.h b/engines/sci/resource.h
index ad9e7a1d8d..1b54b28df9 100644
--- a/engines/sci/resource.h
+++ b/engines/sci/resource.h
@@ -82,10 +82,8 @@ enum ResSourceType {
 #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,
-- 
cgit v1.2.3