Code: Select all
diff -r af2228c6af23 .hgignore
--- a/.hgignore Mon Jan 23 19:51:24 2012 -0700
+++ b/.hgignore Fri Feb 03 16:48:35 2012 -0700
@@ -0,0 +1,8 @@
+syntax: glob
+*.ncb
+*.suo
+Release/
+Debug/
+syntax: regexp
+^MOULOpenSourceClientPlugin/Plasma20/test/
+^MOULOpenSourceClientPlugin/StaticSDKs/
diff -r af2228c6af23 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/winmain.cpp
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/winmain.cpp Mon Jan 23 19:51:24 2012 -0700
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/winmain.cpp Fri Feb 03 16:48:35 2012 -0700
@@ -88,7 +88,7 @@
#if BUILD_TYPE == BUILD_TYPE_DEV
#define STATUS_PATH L"www2.cyanworlds.com"
#else
- #define STATUS_PATH L"support.cyanworlds.com"
+ #define STATUS_PATH L"foundry.openuru.org"
#endif
//
@@ -1415,7 +1415,7 @@
}
else if (HIWORD(wParam) == BN_CLICKED && LOWORD(wParam) == IDC_URULOGIN_GAMETAPLINK)
{
- ShellExecute(NULL, "open", "http://www.mystonline.com/signup.html", NULL, NULL, SW_SHOWNORMAL);
+ ShellExecute(NULL, "open", "http://foundry.openuru.org/forms/index.php", NULL, NULL, SW_SHOWNORMAL);
return TRUE;
}
diff -r af2228c6af23 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plUruLauncher/Main.cpp
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plUruLauncher/Main.cpp Mon Jan 23 19:51:24 2012 -0700
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plUruLauncher/Main.cpp Fri Feb 03 16:48:35 2012 -0700
@@ -58,7 +58,7 @@
#if BUILD_TYPE == BUILD_TYPE_DEV
#define STATUS_PATH L"www2.cyanworlds.com"
#else
- #define STATUS_PATH L"support.cyanworlds.com"
+ #define STATUS_PATH L"foundry.openuru.org"
#endif
diff -r af2228c6af23 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetBase/Private/pnNbSrvs.cpp
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetBase/Private/pnNbSrvs.cpp Mon Jan 23 19:51:24 2012 -0700
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetBase/Private/pnNbSrvs.cpp Fri Feb 03 16:48:35 2012 -0700
@@ -73,7 +73,7 @@
#elif BUILD_TYPE == BUILD_TYPE_BETA
L"beta-auth.urulive.com"
#elif BUILD_TYPE == BUILD_TYPE_LIVE
- L"184.73.198.22" //L"auth.urulive.com"
+ L"foundry.openuru.org" //L"auth.urulive.com"
#else
# error "Unknown build type"
#endif
@@ -99,7 +99,7 @@
#elif BUILD_TYPE == BUILD_TYPE_BETA
L"beta-file.urulive.com"
#elif BUILD_TYPE == BUILD_TYPE_LIVE
- L"67.202.54.141" //unused
+ L"foundry.openuru.org" //unused
#else
# error "Unknown build type"
#endif
@@ -151,7 +151,7 @@
#elif BUILD_TYPE == BUILD_TYPE_BETA
L"beta-csr.urulive.com"
#elif BUILD_TYPE == BUILD_TYPE_LIVE
- L"184.73.198.22"
+ L"foundry.openuru.org"
#else
# error "Unknown build type"
#endif
diff -r af2228c6af23 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetBase/pnNbAuthKey.hpp
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetBase/pnNbAuthKey.hpp Mon Jan 23 19:51:24 2012 -0700
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetBase/pnNbAuthKey.hpp Fri Feb 03 16:48:35 2012 -0700
...OMITTED...
diff -r af2228c6af23 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetBase/pnNbGameKey.hpp
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetBase/pnNbGameKey.hpp Mon Jan 23 19:51:24 2012 -0700
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetBase/pnNbGameKey.hpp Fri Feb 03 16:48:35 2012 -0700
...OMITTED...
diff -r af2228c6af23 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetBase/pnNbGateKeeperKey.hpp
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetBase/pnNbGateKeeperKey.hpp Mon Jan 23 19:51:24 2012 -0700
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetBase/pnNbGateKeeperKey.hpp Fri Feb 03 16:48:35 2012 -0700
...OMITTED...
diff -r af2228c6af23 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrProductId.cpp
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrProductId.cpp Mon Jan 23 19:51:24 2012 -0700
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrProductId.cpp Fri Feb 03 16:48:35 2012 -0700
@@ -60,7 +60,8 @@
namespace Uru {
static const wchar kCoreName[] = L"UruLive";
static const wchar kShortName[] = L"UruLive";
- static const wchar kLongName[] = L"Uru Live";
+// static const wchar kLongName[] = L"Uru Live";
+ static const wchar kLongName[] = L"Uru Live Minkata Shard";
static const Uuid kId(L"ea489821-6c35-4bd0-9dae-bb17c585e680");
}
diff -r af2228c6af23 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceLog.cpp
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceLog.cpp Mon Jan 23 19:51:24 2012 -0700
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceLog.cpp Fri Feb 03 16:48:35 2012 -0700
@@ -48,7 +48,7 @@
#include "Pch.h"
#pragma hdrstop
-#if defined(PLASMA_EXTERNAL_RELEASE) && (BUILD_TYPE == BUILD_TYPE_LIVE)
+#if 0//Minkata//defined(PLASMA_EXTERNAL_RELEASE) && (BUILD_TYPE == BUILD_TYPE_LIVE)
// If this is an external live build then don't write log files
#define ACELOG_NO_LOG_FILES
#endif
diff -r af2228c6af23 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp Mon Jan 23 19:51:24 2012 -0700
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp Fri Feb 03 16:48:35 2012 -0700
@@ -392,7 +392,7 @@
//// plStatusLog ////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
-#if defined(PLASMA_EXTERNAL_RELEASE) && (BUILD_TYPE == BUILD_TYPE_LIVE)
+#if 0//Minkata//defined(PLASMA_EXTERNAL_RELEASE) && (BUILD_TYPE == BUILD_TYPE_LIVE)
// If this is an external live build then don't write log files
UInt32 plStatusLog::fLoggingOff = true;
#else
@@ -466,7 +466,7 @@
wchar* ext=nil;
IParseFileName(file, fileNoExt, &ext);
fEncryptMe = false;
-#ifdef PLASMA_EXTERNAL_RELEASE
+#if 0//Minkata//def PLASMA_EXTERNAL_RELEASE
fEncryptMe = ( wcsicmp( fFilename.c_str(), L"chat.log" ) != 0 ) ? true : false;
if( fEncryptMe )
ext = L".elf";
diff -r 2a3419e38fc2 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/winmain.cpp
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/winmain.cpp Mon Jan 23 20:40:32 2012 -0700
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/winmain.cpp Mon Jan 23 20:41:48 2012 -0700
@@ -145,7 +145,7 @@
//============================================================================
// External patcher file
//============================================================================
-#ifdef PLASMA_EXTERNAL_RELEASE
+#if 0//Minkata//def PLASMA_EXTERNAL_RELEASE
static wchar s_patcherExeName[] = L"UruLauncher.exe";
@@ -919,7 +919,7 @@
void DebugMsgF(const char* format, ...)
{
-#ifndef PLASMA_EXTERNAL_RELEASE
+#if 1//Minkata//ndef PLASMA_EXTERNAL_RELEASE
va_list args;
va_start(args, format);
@@ -1131,7 +1131,7 @@
wchar fileAndPath[MAX_PATH];
PathGetInitDirectory(fileAndPath, arrsize(fileAndPath));
PathAddFilename(fileAndPath, fileAndPath, L"login.dat", arrsize(fileAndPath));
-#ifndef PLASMA_EXTERNAL_RELEASE
+#if 1//Minkata//ndef PLASMA_EXTERNAL_RELEASE
// internal builds can use the local init directory
wchar localFileAndPath[MAX_PATH];
StrCopy(localFileAndPath, L"init\\login.dat", arrsize(localFileAndPath));
@@ -1169,7 +1169,7 @@
wchar fileAndPath[MAX_PATH];
PathGetInitDirectory(fileAndPath, arrsize(fileAndPath));
PathAddFilename(fileAndPath, fileAndPath, L"login.dat", arrsize(fileAndPath));
-#ifndef PLASMA_EXTERNAL_RELEASE
+#if 1//Minkata//ndef PLASMA_EXTERNAL_RELEASE
// internal builds can use the local init directory
wchar localFileAndPath[MAX_PATH];
StrCopy(localFileAndPath, L"init\\login.dat", arrsize(localFileAndPath));
@@ -1587,7 +1587,7 @@
cmdParser.Parse();
bool doIntroDialogs = true;
-#ifndef PLASMA_EXTERNAL_RELEASE
+#if 1//Minkata//ndef PLASMA_EXTERNAL_RELEASE
if(cmdParser.IsSpecified(kArgSkipLoginDialog))
doIntroDialogs = false;
if(cmdParser.IsSpecified(kArgLocalData))
@@ -1627,7 +1627,7 @@
TGDoCiderDetection ();
-#ifdef PLASMA_EXTERNAL_RELEASE
+#if 1//Minkata//def PLASMA_EXTERNAL_RELEASE
// if the client was started directly, run the patcher, and shutdown
STARTUPINFOW si;
PROCESS_INFORMATION pi;
@@ -1956,7 +1956,7 @@
{
bool expired = false;
-#ifndef PLASMA_EXTERNAL_RELEASE
+#if 1//Minkata//ndef PLASMA_EXTERNAL_RELEASE
char ourPath[MAX_PATH];
GetModuleFileName(NULL, ourPath, sizeof(ourPath));
DWORD ok = 0;