[Scummvm-cvs-logs] SF.net SVN: scummvm: [21812] scummvm/trunk/common
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Tue Apr 11 15:32:05 CEST 2006
Revision: 21812
Author: fingolfin
Date: 2006-04-11 15:31:47 -0700 (Tue, 11 Apr 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21812&view=rev
Log Message:
-----------
Don't hardcode specific values for our language enums, as nothing should depend on them -- any code that is broken by this change was wrong to start with and must be fixed accordingly
Modified Paths:
--------------
scummvm/trunk/common/util.cpp
scummvm/trunk/common/util.h
Modified: scummvm/trunk/common/util.cpp
===================================================================
--- scummvm/trunk/common/util.cpp 2006-04-11 22:29:51 UTC (rev 21811)
+++ scummvm/trunk/common/util.cpp 2006-04-11 22:31:47 UTC (rev 21812)
@@ -112,6 +112,7 @@
const LanguageDescription g_languages[] = {
{"en", "English", EN_ANY}, // Generic English (when only one game version exist)
{"us", "English (US)", EN_USA},
+ {"gb", "English (GB)", EN_GRB},
{"de", "German", DE_DEU},
{"fr", "French", FR_FRA},
{"it", "Italian", IT_ITA},
@@ -120,7 +121,6 @@
{"jp", "Japanese", JA_JPN},
{"zh", "Chinese (Taiwan)", ZH_TWN},
{"kr", "Korean", KO_KOR},
- {"gb", "English (GB)", EN_GRB},
{"se", "Swedish", SE_SWE},
{"hb", "Hebrew", HB_ISR},
{"ru", "Russian", RU_RUS},
Modified: scummvm/trunk/common/util.h
===================================================================
--- scummvm/trunk/common/util.h 2006-04-11 22:29:51 UTC (rev 21811)
+++ scummvm/trunk/common/util.h 2006-04-11 22:31:47 UTC (rev 21812)
@@ -84,31 +84,30 @@
};
/**
- * List of language ids.
- * @note The order and mappings of the values 0..8 are *required* to stay the
- * way they are now, as scripts in COMI rely on them. So don't touch them.
- * I am working on removing this restriction.
+ * List of game language.
*/
enum Language {
- UNK_LANG = -1, // Use default language (i.e. none specified)
- EN_ANY = 0, // Generic English (when only one game version exist)
- EN_USA = 1,
- DE_DEU = 2,
- FR_FRA = 3,
- IT_ITA = 4,
- PT_BRA = 5,
- ES_ESP = 6,
- JA_JPN = 7,
- ZH_TWN = 8,
- KO_KOR = 9,
- SE_SWE = 10,
- EN_GRB = 11,
- HB_ISR = 20,
- RU_RUS = 21,
- CZ_CZE = 22,
- NL_NLD = 23,
- NB_NOR = 24,
- PL_POL = 25
+ EN_ANY, // Generic English (when only one game version exist)
+ EN_USA,
+ EN_GRB,
+
+ DE_DEU,
+ FR_FRA,
+ IT_ITA,
+ PT_BRA,
+ ES_ESP,
+ JA_JPN,
+ ZH_TWN,
+ KO_KOR,
+ SE_SWE,
+ HB_ISR,
+ RU_RUS,
+ CZ_CZE,
+ NL_NLD,
+ NB_NOR,
+ PL_POL,
+
+ UNK_LANG = -1 // Use default language (i.e. none specified)
};
struct LanguageDescription {
@@ -132,22 +131,21 @@
* game in question.
*/
enum Platform {
- kPlatformUnknown = -1,
- kPlatformPC = 0,
- kPlatformAmiga = 1,
- kPlatformAtariST = 2,
- kPlatformMacintosh = 3,
- kPlatformFMTowns = 4,
- kPlatformWindows = 5,
- kPlatformNES = 6,
- kPlatformC64 = 7,
- kPlatformLinux = 8,
- kPlatformAcorn = 9,
- kPlatformSegaCD = 10,
- kPlatform3DO = 11
-/*
- kPlatformPCEngine
-*/
+ kPlatformPC,
+ kPlatformAmiga,
+ kPlatformAtariST,
+ kPlatformMacintosh,
+ kPlatformFMTowns,
+ kPlatformWindows,
+ kPlatformNES,
+ kPlatformC64,
+ kPlatformLinux,
+ kPlatformAcorn,
+ kPlatformSegaCD,
+ kPlatform3DO,
+// kPlatformPCEngine,
+
+ kPlatformUnknown = -1
};
struct PlatformDescription {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list