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

[fingolfin at users.sourceforge.net]

Revision: 40600
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40600&view=rev
Author:   fingolfin
Date:     2009-05-15 09:29:03 +0000 (Fri, 15 May 2009)

Log Message:
-----------
SCI: Keep a single copy of the versionNames array; this fixes warning about it (well, one of its many copies) being unused

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

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2009-05-15 09:28:31 UTC (rev 40599)
+++ scummvm/trunk/engines/sci/sci.cpp	2009-05-15 09:29:03 UTC (rev 40600)
@@ -43,6 +43,19 @@
 
 extern gfx_driver_t gfx_driver_scummvm;
 
+const char *versionNames[9] = {
+	"Autodetected",
+	"SCI0",
+	"SCI01 EGA",
+	"SCI01 VGA",
+	"SCI01 VGA ODD",
+	"SCI1 early",
+	"SCI1 late",
+	"SCI1.1",
+	"SCI32"
+};
+
+
 int c_quit(EngineState *s, const Common::Array<cmd_param_t> &cmdParams) {
 	script_abort_flag = 1; // Terminate VM
 	_debugstate_valid = 0;

Modified: scummvm/trunk/engines/sci/sci.h
===================================================================
--- scummvm/trunk/engines/sci/sci.h	2009-05-15 09:28:31 UTC (rev 40599)
+++ scummvm/trunk/engines/sci/sci.h	2009-05-15 09:29:03 UTC (rev 40600)
@@ -77,17 +77,7 @@
 	SCI_VERSION_32 = 8
 };
 
-static const char *versionNames[9] = {
-	"Autodetected",
-	"SCI0",
-	"SCI01 EGA",
-	"SCI01 VGA",
-	"SCI01 VGA ODD",
-	"SCI1 early",
-	"SCI1 late",
-	"SCI1.1",
-	"SCI32"
-};
+extern const char *versionNames[9];
 
 enum SciGameFlags {
 	/*


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