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
sdlsetindex-ou
CyanWorlds 13 years ago
parent
commit
a363a783c5
  1. 13
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp
  2. 2
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildId.cpp
  3. 4
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.h

13
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

2
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);

4
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"

Loading…
Cancel
Save