diff options
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/scumm.h | 14 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 2 |
2 files changed, 3 insertions, 13 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h index d1bbfe6408..9c943e5b74 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -160,19 +160,6 @@ enum { MBS_MAX_KEY = 0x0200 }; -// possible languages for comi -enum Languages { - EN_USA = 0, - DE_DEU = 1, - FR_FRA = 2, - IT_ITA = 3, - PT_BRA = 4, - ES_ESP = 5, - JA_JPN = 6, - ZH_TWN = 7, - KO_KOR = 8 -}; - #define _maxRooms res.num[rtRoom] #define _maxScripts res.num[rtScript] #define _maxCostumes res.num[rtCostume] @@ -393,6 +380,7 @@ public: uint16 _debugMode, _soundCardType; /* Not sure where this stuff goes */ + uint16 _language; byte isMaskActiveAt(int l, int t, int r, int b, byte *mem); void startScene(int room, Actor *a, int b); virtual void setupScummVars(); diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index eb15759aec..fbdb7b0e3e 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -94,6 +94,7 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst) _noSubtitles = detector->_noSubtitles; _defaultTalkDelay = detector->_talkSpeed; _use_adlib = detector->_use_adlib; + _language = detector->_language; memset(&res, 0, sizeof(res)); _allocatedSize = 0; _roomResource = 0; @@ -367,6 +368,7 @@ void Scumm::initScummVars() if (_features & GF_AFTER_V8) { // Fixme: How do we deal with non-cd installs? _vars[VAR_CURRENTDISK] = 1; + _vars[VAR_LANGUAGE] = _language; } } |