From a363a783c5d2ffc7aa104275e5f34feb81db0e4b Mon Sep 17 00:00:00 2001 From: CyanWorlds Date: Tue, 19 Apr 2011 14:24:55 -0700 Subject: [PATCH] MOULa build 1.902 - dragossh's "Bevin" into "Hood" and Chogon added ability to select a specific age instance by a meta name and BuildMachine bumped buildID --- .../Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp | 13 ++++++++++++- .../NucleusLib/pnProduct/Private/pnPrBuildId.cpp | 2 +- .../Plasma/PubUtilLib/plNetCommon/plNetCommon.h | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp index 5ab68328..d5ef06db 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp @@ -107,7 +107,18 @@ const char * pyAgeInfoStruct::GetAgeInstanceGuid() const void pyAgeInfoStruct::SetAgeInstanceGuid( const char * guid ) { - fAgeInfo.SetAgeInstanceGuid( &plUUID( guid ) ); + if ( guid[0] == '@' ) + { + // if it starts with an @ then do a meta kind of GUID + std::string curInst = fAgeInfo.GetAgeInstanceName(); + std::string y = curInst + guid; + + plUUID instanceGuid; + CryptDigest(kCryptMd5, instanceGuid.fData , y.length(), y.c_str()); + fAgeInfo.SetAgeInstanceGuid(&instanceGuid); + } + else + fAgeInfo.SetAgeInstanceGuid( &plUUID( guid ) ); } Int32 pyAgeInfoStruct::GetAgeSequenceNumber() const diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildId.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildId.cpp index cb08e303..d4a4332e 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildId.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildId.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // This line must NEVER be modified manually; it is automatically updated // by the build server. -#define BUILD_ID 897 +#define BUILD_ID 902 COMPILER_ASSERT(BUILD_ID != 0); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.h index dd3aaa1a..42c24a4d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.h @@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define kNeighborhoodAgeFilename "Neighborhood" #define kNeighborhoodAgeFilenameW L"Neighborhood" -#define kNeighborhoodAgeInstanceName "Bevin" -#define kNeighborhoodAgeInstanceNameW L"Bevin" +#define kNeighborhoodAgeInstanceName "Hood" +#define kNeighborhoodAgeInstanceNameW L"Hood" #define kStartupNeighborhoodUserDefinedName "DRC" #define kStartupNeighborhoodUserDefinedNameW L"DRC"