From f0ca2397295197798e770a8d3812cf1a3fa6648b Mon Sep 17 00:00:00 2001 From: CyanWorlds Date: Thu, 21 Apr 2011 15:43:17 -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 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp index e0bf0548..4aeab4e5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp +++ b/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/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildId.cpp b/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildId.cpp index 70034d72..f65868f4 100644 --- a/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildId.cpp +++ b/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);