Browse Source

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

CyanWorlds 14 years ago committed by CyanWorlds
parent
commit
f0ca239729
  1. 11
      Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp
  2. 2
      Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildId.cpp

11
Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp

@ -107,6 +107,17 @@ const char * pyAgeInfoStruct::GetAgeInstanceGuid() const
void pyAgeInfoStruct::SetAgeInstanceGuid( const char * guid ) void pyAgeInfoStruct::SetAgeInstanceGuid( const char * 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 ) ); fAgeInfo.SetAgeInstanceGuid( &plUUID( guid ) );
} }

2
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 // This line must NEVER be modified manually; it is automatically updated
// by the build server. // by the build server.
#define BUILD_ID 897 #define BUILD_ID 902
COMPILER_ASSERT(BUILD_ID != 0); COMPILER_ASSERT(BUILD_ID != 0);

Loading…
Cancel
Save