diff options
| author | Max Horn | 2009-05-15 09:29:03 +0000 |
|---|---|---|
| committer | Max Horn | 2009-05-15 09:29:03 +0000 |
| commit | d8d18d14ef501048d8e2c83ecfca2a17202de638 (patch) | |
| tree | eb2d6ce4de0a97569da91255f91a70063c8b3d61 /engines | |
| parent | 9c44705f0549fde3aad7be6e991fa21b70f984a9 (diff) | |
| download | scummvm-rg350-d8d18d14ef501048d8e2c83ecfca2a17202de638.tar.gz scummvm-rg350-d8d18d14ef501048d8e2c83ecfca2a17202de638.tar.bz2 scummvm-rg350-d8d18d14ef501048d8e2c83ecfca2a17202de638.zip | |
SCI: Keep a single copy of the versionNames array; this fixes warning about it (well, one of its many copies) being unused
svn-id: r40600
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/sci.cpp | 13 | ||||
| -rw-r--r-- | engines/sci/sci.h | 12 |
2 files changed, 14 insertions, 11 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index 48b8ea7beb..b2532e46b2 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -43,6 +43,19 @@ namespace Sci { 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; diff --git a/engines/sci/sci.h b/engines/sci/sci.h index db8a40ebd1..b8eed055e5 100644 --- a/engines/sci/sci.h +++ b/engines/sci/sci.h @@ -77,17 +77,7 @@ enum SciGameVersions { 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 { /* |