From 87e228ca36483073faeb8c846d6696a069b52ff6 Mon Sep 17 00:00:00 2001 From: diafero Date: Wed, 3 Aug 2011 00:25:43 +0200 Subject: [PATCH] fix the internal launcher to expect a different filename than the external one, so both can co-exist in the same folder Internal launchers MUST now be called plUruLauncher, renaming them will break them! as per request of branan in #64 --- Sources/Plasma/Apps/plClient/winmain.cpp | 9 +-------- Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp | 5 ++++- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Sources/Plasma/Apps/plClient/winmain.cpp b/Sources/Plasma/Apps/plClient/winmain.cpp index 33a62fbf..8d647953 100644 --- a/Sources/Plasma/Apps/plClient/winmain.cpp +++ b/Sources/Plasma/Apps/plClient/winmain.cpp @@ -116,19 +116,12 @@ static const unsigned AUTH_FAILED_TIMER = 2; #define FAKE_PASS_STRING "********" //============================================================================ -// External patcher file +// External patcher file (directly starting plClient is not allowed) //============================================================================ #ifdef PLASMA_EXTERNAL_RELEASE static wchar s_patcherExeName[] = L"UruLauncher.exe"; -//============================================================================ -// Internal patcher file -//============================================================================ -#else - -static wchar s_patcherExeName[] = L"plUruLauncher.exe"; - #endif // PLASMA_EXTERNAL_RELEASE //============================================================================ diff --git a/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp b/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp index 1158f1cd..9d8f9e5f 100644 --- a/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp +++ b/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp @@ -164,8 +164,11 @@ double ProcessManifestEntryParam::startTime = 0; // IMPORTANT: This string may NEVER change. Doing so will break self-patching, // leaving clients with older patchers "dead in the water", without // a way to play Uru. +#ifdef PLASMA_EXTERNAL_RELEASE const wchar kPatcherExeFilename[] = L"UruLauncher.exe"; - +#else +const wchar kPatcherExeFilename[] = L"plUruLauncher.exe"; +#endif //============================================================================