diff --git a/Sources/Plasma/Apps/plClient/winmain.cpp b/Sources/Plasma/Apps/plClient/winmain.cpp index 78c25dc8..0dd1aa6c 100644 --- a/Sources/Plasma/Apps/plClient/winmain.cpp +++ b/Sources/Plasma/Apps/plClient/winmain.cpp @@ -1602,7 +1602,6 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nC } #endif - plLocalization::SetDefaultLanguage(); // Load an optional general.ini wchar gipath[MAX_PATH]; PathGetInitDirectory(gipath, arrsize(gipath)); diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.cpp b/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.cpp index 9ffa3b19..63f52635 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.cpp +++ b/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.cpp @@ -188,57 +188,3 @@ std::vector plLocalization::StringToLocal(const std::wstring & loc retVal[0] = localizedText; // if no tags were in the text, we assume it to be English return retVal; } - -#include "hsWindows.h" - -void plLocalization::SetDefaultLanguage() -{ - fLanguage = kEnglish; -#if 0 // disable all languages -#ifdef HS_BUILD_FOR_WIN32 - HKEY hLocalKey = NULL; - HKEY hMSKey = NULL; - HKEY hWindowsKey = NULL; - HKEY hCurVerKey = NULL; - HKEY hUninstKey = NULL; - HKEY hUruKey = NULL; - - #define RegOpen(key, retKey, subKeyName) RegOpenKeyEx(key, subKeyName, 0, KEY_READ, &retKey) == ERROR_SUCCESS - - if (RegOpen(HKEY_LOCAL_MACHINE, hLocalKey, "software") && - RegOpen(hLocalKey, hMSKey, "microsoft") && - RegOpen(hMSKey, hWindowsKey, "windows") && - RegOpen(hWindowsKey, hCurVerKey, "currentversion") && - RegOpen(hCurVerKey, hUninstKey, "uninstall") && - RegOpen(hUninstKey, hUruKey, "Uru - Ages Beyond Myst")) - { - char value[20]; - DWORD bufsize = sizeof(value); - if (RegQueryValueEx(hUruKey, "Lang", NULL, NULL, (LPBYTE)value, &bufsize) == ERROR_SUCCESS) - { - if (hsStrEQ(value, "en")) - fLanguage = kEnglish; - else if (hsStrEQ(value, "fr")) - fLanguage = kFrench; - else if (hsStrEQ(value, "de")) - fLanguage = kGerman; - else if (hsStrEQ(value, "es")) - fLanguage = kSpanish; - else if (hsStrEQ(value, "it")) - fLanguage = kItalian; - else if (hsStrEQ(value, "jp")) - fLanguage = kJapanese; - else - fLanguage = kEnglish; - } - } - - RegCloseKey(hLocalKey); - RegCloseKey(hMSKey); - RegCloseKey(hWindowsKey); - RegCloseKey(hCurVerKey); - RegCloseKey(hUninstKey); - RegCloseKey(hUruKey); -#endif // HS_BUILD_FOR_WIN32 -#endif // 0 -} diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.h b/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.h index 888c8f5b..ab341662 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.h +++ b/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.h @@ -67,9 +67,6 @@ protected: static hsBool IGetLocalized(const char* name, Language lang, char* localizedName); public: - // Sets the default language, as determined by the installer - static void SetDefaultLanguage(); - static void SetLanguage(Language lang) { fLanguage = lang; } static Language GetLanguage() { return fLanguage; }