Browse Source

Merge pull request #293 from Hoikas/trolling

Fix bugs
Branan Purvine-Riley 12 years ago
parent
commit
e98aeabb80
  1. 2
      Sources/Plasma/Apps/plClient/winmain.cpp
  2. 2
      Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp
  3. 2
      Sources/Plasma/PubUtilLib/plResMgr/plRegistryKeyList.cpp

2
Sources/Plasma/Apps/plClient/winmain.cpp

@ -1237,7 +1237,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nC
if (!eventExists) // if it is missing, assume patcher wasn't launched if (!eventExists) // if it is missing, assume patcher wasn't launched
{ {
cmdLine << plString::FromWchar(s_patcherExeName); cmdLine << "\\" << plString::FromWchar(s_patcherExeName);
GetAuthSrvHostnames(&addrs); GetAuthSrvHostnames(&addrs);
if(strlen(addrs[0])) if(strlen(addrs[0]))

2
Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp

@ -966,7 +966,7 @@ void UruStartProc (void * param) {
//fprintf(stderr, "URUPlayer StartProc gamePath is:%ws\n", workDir); //fprintf(stderr, "URUPlayer StartProc gamePath is:%ws\n", workDir);
wchar_t cmdLine[MAX_PATH]; wchar_t cmdLine[MAX_PATH];
StrPrintf(cmdLine, arrsize(cmdLine), L"%s%s %s", workDir, s_clientExeName, info->cmdLine); StrPrintf(cmdLine, arrsize(cmdLine), L"%s\\%s %s", workDir, s_clientExeName, info->cmdLine);
// Create the named event so the client won't restart us (Windows will clean it up when we exit) // Create the named event so the client won't restart us (Windows will clean it up when we exit)
HANDLE hPatcherEvent = CreateEventW(nil, TRUE, FALSE, L"UruPatcherEvent"); HANDLE hPatcherEvent = CreateEventW(nil, TRUE, FALSE, L"UruPatcherEvent");

2
Sources/Plasma/PubUtilLib/plResMgr/plRegistryKeyList.cpp

@ -79,7 +79,7 @@ plKeyImp* plRegistryKeyList::FindKey(const plUoid& uoid) const
if (objectID <= fKeys.size()) if (objectID <= fKeys.size())
{ {
#ifdef PLASMA_EXTERNAL_RELEASE #ifdef PLASMA_EXTERNAL_RELEASE
return fStaticKeys[objectID-1]; return fKeys[objectID-1];
#else #else
// If this is an internal release, our objectIDs might not match // If this is an internal release, our objectIDs might not match
// because of local data. Verify that we have the right key by // because of local data. Verify that we have the right key by

Loading…
Cancel
Save