OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Get rid of GuidGenerate calls.

Browse Source
This commit is contained in:
Darryl Pogue
2012-11-18 16:41:33 -08:00
parent 2c055f91f5
commit fd8541e18d
11 changed files with 32 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp
View File

@ -2828,12 +2828,12 @@ void cyMisc::SendFriendInvite(const wchar_t email[], const wchar_t toName[])
if (RelVaultNode* pNode = VaultGetPlayerNodeIncRef())
{
VaultPlayerNode player(pNode);
Uuid inviteUuid = player.inviteUuid;
plUUID inviteUuid(player.inviteUuid);
// If we don't have an invite UUID set then make a new one
if (GuidIsNil(inviteUuid))
if (inviteUuid.IsNull())
{
inviteUuid = GuidGenerate();
inviteUuid = plUUID::Generate();
player.SetInviteUuid(inviteUuid);
}
@ -2844,11 +2844,9 @@ void cyMisc::SendFriendInvite(const wchar_t email[], const wchar_t toName[])
PyObject* cyMisc::PyGuidGenerate()
{
char guidStr[64];
Uuid newGuid = GuidGenerate();
GuidToString(newGuid, guidStr, arrsize(guidStr));
plUUID newGuid = plUUID::Generate();
return PyString_FromString(guidStr);
return PyString_FromString(newGuid.AsString().c_str());
}
PyObject* cyMisc::GetAIAvatarsByModelName(const char* name)

2
Sources/Plasma/FeatureLib/pfPython/pyVault.cpp
View File

@ -671,7 +671,7 @@ void pyVault::CreateNeighborhood()
desc = plString::Format( "%s's %s", nc->GetPlayerName().c_str(), link.GetAgeInfo()->GetAgeInstanceName() );
}
plUUID guid(GuidGenerate());
plUUID guid = plUUID::Generate();
link.GetAgeInfo()->SetAgeInstanceGuid(&guid);
link.GetAgeInfo()->SetAgeUserDefinedName( title.c_str() );
link.GetAgeInfo()->SetAgeDescription( desc.c_str() );