From 8f8fbb9dacfa99687c38dd55cd8ec49d4f6c7140 Mon Sep 17 00:00:00 2001 From: Joseph Davies Date: Thu, 14 Jul 2011 13:50:42 -0700 Subject: [PATCH] Add support for general.ini settings file. --- Sources/Plasma/Apps/plClient/winmain.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Sources/Plasma/Apps/plClient/winmain.cpp b/Sources/Plasma/Apps/plClient/winmain.cpp index 6a0799b8..78c25dc8 100644 --- a/Sources/Plasma/Apps/plClient/winmain.cpp +++ b/Sources/Plasma/Apps/plClient/winmain.cpp @@ -1603,6 +1603,18 @@ 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)); + PathAddFilename(gipath, gipath, L"general.ini", arrsize(gipath)); + FILE *generalini = _wfopen(gipath, L"rb"); + if (generalini) + { + fclose(generalini); + pfConsoleEngine tempConsole; + tempConsole.ExecuteFile(gipath); + } + // If another instance is running, exit. We'll automatically release our // lock on the mutex when our process exits HANDLE hOneInstance = CreateMutex(nil, FALSE, "UruExplorer"); @@ -1616,13 +1628,13 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nC case plLocalization::kGerman: hsMessageBox("URU wird bereits in einer anderen Instanz ausgeführt", "Fehler", hsMessageBoxNormal); break; -/* case plLocalization::kSpanish: + case plLocalization::kSpanish: hsMessageBox("En estos momentos se está ejecutando otra copia de URU", "Error", hsMessageBoxNormal); break; case plLocalization::kItalian: hsMessageBox("Un'altra copia di URU è già aperta", "Errore", hsMessageBoxNormal); break; -*/ // default is English + // default is English default: hsMessageBox("Another copy of URU is already running", "Error", hsMessageBoxNormal); break;