diff options
| author | Gregory Montoir | 2006-11-03 22:36:05 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2006-11-03 22:36:05 +0000 |
| commit | d5608e82edb4a73f6ab30a8db9a79dc16ed2ed9f (patch) | |
| tree | 2e0611f2927cd65e0595f3ea3d6abe06f804fda4 /engines/queen/input.cpp | |
| parent | b9019637f861d88653c471403d6ed73a4173c13c (diff) | |
| download | scummvm-rg350-d5608e82edb4a73f6ab30a8db9a79dc16ed2ed9f.tar.gz scummvm-rg350-d5608e82edb4a73f6ab30a8db9a79dc16ed2ed9f.tar.bz2 scummvm-rg350-d5608e82edb4a73f6ab30a8db9a79dc16ed2ed9f.zip | |
cleanup (got rid of the custom Language enum, re-used the one in the Common namespace)
svn-id: r24595
Diffstat (limited to 'engines/queen/input.cpp')
| -rw-r--r-- | engines/queen/input.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/queen/input.cpp b/engines/queen/input.cpp index 84e91f7a1c..82bcc9d8da 100644 --- a/engines/queen/input.cpp +++ b/engines/queen/input.cpp @@ -27,7 +27,7 @@ namespace Queen { -const char *Input::_commandKeys[LANGUAGE_COUNT] = { +const char *Input::_commandKeys[] = { "ocmglptu", // English "osbgpnre", // German "ofdnepau", // French @@ -36,7 +36,7 @@ const char *Input::_commandKeys[LANGUAGE_COUNT] = { "acodmthu" // Spanish }; -const Verb Input::_verbKeys[8] = { +const Verb Input::_verbKeys[] = { VERB_OPEN, VERB_CLOSE, VERB_MOVE, @@ -47,7 +47,7 @@ const Verb Input::_verbKeys[8] = { VERB_USE }; -Input::Input(Language language, OSystem *system) : +Input::Input(Common::Language language, OSystem *system) : _system(system), _fastMode(false), _keyVerb(VERB_NONE), _cutawayRunning(false), _canQuit(false), _cutawayQuit(false), _dialogueRunning(false), _talkQuit(false), _quickSave(false), @@ -55,23 +55,23 @@ Input::Input(Language language, OSystem *system) : _mouse_y(0), _mouseButton(0), _idleTime(0) { switch (language) { - case ENGLISH: - case RUSSIAN: + case Common::EN_ANY: + case Common::RU_RUS: _currentCommandKeys = _commandKeys[0]; break; - case GERMAN: + case Common::DE_DEU: _currentCommandKeys = _commandKeys[1]; break; - case FRENCH: + case Common::FR_FRA: _currentCommandKeys = _commandKeys[2]; break; - case ITALIAN: + case Common::IT_ITA: _currentCommandKeys = _commandKeys[3]; break; - case HEBREW: + case Common::HB_ISR: _currentCommandKeys = _commandKeys[4]; break; - case SPANISH: + case Common::ES_ESP: _currentCommandKeys = _commandKeys[5]; break; default: |