diff options
| author | Max Horn | 2008-08-27 17:41:05 +0000 |
|---|---|---|
| committer | Max Horn | 2008-08-27 17:41:05 +0000 |
| commit | baf975f0724caeecf35eb601436f99efd8e52beb (patch) | |
| tree | 3db209215ba59007de9ed4d3561f1d3fbac8ec26 /engines | |
| parent | de64aa9c4a5537ca1cd7ac237f488ae5777a03ea (diff) | |
| download | scummvm-rg350-baf975f0724caeecf35eb601436f99efd8e52beb.tar.gz scummvm-rg350-baf975f0724caeecf35eb601436f99efd8e52beb.tar.bz2 scummvm-rg350-baf975f0724caeecf35eb601436f99efd8e52beb.zip | |
cleanup
svn-id: r34191
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/tinsel/dw.h | 7 | ||||
| -rw-r--r-- | engines/tinsel/inventory.cpp | 16 |
2 files changed, 12 insertions, 11 deletions
diff --git a/engines/tinsel/dw.h b/engines/tinsel/dw.h index d14dd43fa2..9ceef37858 100644 --- a/engines/tinsel/dw.h +++ b/engines/tinsel/dw.h @@ -110,8 +110,11 @@ typedef int HPOLYGON; // Language for the resource strings enum LANGUAGE { - TXT_ENGLISH, TXT_FRENCH, TXT_GERMAN, - TXT_ITALIAN, TXT_SPANISH + TXT_ENGLISH, + TXT_FRENCH, + TXT_GERMAN, + TXT_ITALIAN, + TXT_SPANISH }; } // end of namespace Tinsel diff --git a/engines/tinsel/inventory.cpp b/engines/tinsel/inventory.cpp index 2a0f3695c0..6735b3ff9d 100644 --- a/engines/tinsel/inventory.cpp +++ b/engines/tinsel/inventory.cpp @@ -769,25 +769,23 @@ bool LanguageChange(void) { #ifdef USE_3FLAGS // VERY quick dodgy bodge if (cd.selBox == 0) - nLang = TXT_FRENCH; + nLang = TXT_FRENCH; // = 1 else if (cd.selBox == 1) - nLang = TXT_GERMAN; + nLang = TXT_GERMAN; // = 2 else - nLang = TXT_SPANISH; - if (nLang != language) { + nLang = TXT_SPANISH; // = 4 #elif defined(USE_4FLAGS) nLang = (LANGUAGE)(cd.selBox + 1); - if (nLang != language) { #else - if (cd.selBox != language) { - nLang = (LANGUAGE)cd.selBox; + nLang = (LANGUAGE)cd.selBox; #endif + + if (nLang != language) { KillInventory(); ChangeLanguage(nLang); language = nLang; return true; - } - else + } else return false; } #endif |