OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-13 18:17:49 -04:00
Code Releases Activity

Remove all uses of GuidToString.

Browse Source
This commit is contained in:
Darryl Pogue
2012-12-15 21:33:14 -08:00
parent 517d4f6788
commit 274812c057
18 changed files with 34 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.cpp
View File

@ -103,8 +103,8 @@ std::wstring pyGameCli::GameTypeID() const
{
if (gameClient)
{
wchar_t guidStr[256];
GuidToString(gameClient->GetGameTypeId(), guidStr, arrsize(guidStr));
wchar_t guidStr[64];
wcsncpy(guidStr, plUUID(gameClient->GetGameTypeId()).AsString().ToWchar(), 64);
return guidStr;
}
return L"";
@ -182,4 +182,4 @@ PyObject* pyGameCli::UpcastToVarSyncGame()
if (gameClient && (gameClient->GetGameTypeId() == kGameTypeId_VarSync))
return pyVarSyncGame::New(gameClient);
PYTHON_RETURN_NONE;
}
}

10
Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.cpp
View File

@ -108,8 +108,8 @@ std::wstring pyGameMgrInviteReceivedMsg::GameTypeID() const
if (message)
{
const Srv2Cli_GameMgr_InviteReceived* gmMsg = (const Srv2Cli_GameMgr_InviteReceived*)message->netMsg;
wchar_t buffer[256];
GuidToString(gmMsg->gameTypeId, buffer, arrsize(buffer));
wchar_t buffer[64];
wcsncpy(buffer, plUUID(gmMsg->gameTypeId).AsString().ToWchar(), 64);
return buffer;
}
return L"";
@ -149,8 +149,8 @@ std::wstring pyGameMgrInviteRevokedMsg::GameTypeID() const
if (message)
{
const Srv2Cli_GameMgr_InviteRevoked* gmMsg = (const Srv2Cli_GameMgr_InviteRevoked*)message->netMsg;
wchar_t buffer[256];
GuidToString(gmMsg->gameTypeId, buffer, arrsize(buffer));
wchar_t buffer[64];
wcsncpy(buffer, plUUID(gmMsg->gameTypeId).AsString().ToWchar(), 64);
return buffer;
}
return L"";
@ -164,4 +164,4 @@ unsigned long pyGameMgrInviteRevokedMsg::NewGameID() const
return gmMsg->newGameId;
}
return 0;
}
}

2
Sources/Plasma/FeatureLib/pfPython/pyAgeVault.h
View File

@ -82,7 +82,7 @@ public:
static void AddPlasmaClasses(PyObject *m);
plUUID GetAgeGuid( void );
plUUID GetAgeGuid(void);
PyObject * GetAgeSDL() const; // returns pySDLStateDataRecord
void UpdateAgeSDL( pySDLStateDataRecord & pyrec );

2
Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.h
View File

@ -74,7 +74,7 @@ public:
// name of current age
const char * GetAgeName( void ) const;
// unique identifier for this age instance
plUUID GetAgeGuid( void ) const;
plUUID GetAgeGuid(void) const;
};

3
Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.cpp
View File

@ -234,7 +234,8 @@ const char * pyVaultAgeInfoNode::GetAgeInstanceGuid() const
if (fNode) {
VaultAgeInfoNode access(fNode);
GuidToString(access.ageInstUuid, fAgeInstGuid, arrsize(fAgeInstGuid));
strncpy(fAgeInstGuid, plUUID(access.ageInstUuid).AsString().c_str(), 64);
}
return fAgeInstGuid;
}

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

@ -94,7 +94,7 @@ const char * pyVaultMarkerGameNode::GetGameGuid () const
if (fNode) {
VaultMarkerGameNode access(fNode);
GuidToString(access.gameGuid, fGameGuid, arrsize(fGameGuid));
strncpy(fGameGuid, plUUID(access.gameGuid).AsString().c_str(), 64);
}
return fGameGuid;
}

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

@ -332,7 +332,7 @@ const char * pyVaultNode::GetCreateAgeGuid( void )
if (fNode) {
fCreateAgeGuid = (char*)malloc(64);
GuidToString(fNode->createAgeUuid, fCreateAgeGuid, 64);
strncpy(fCreateAgeGuid, plUUID(fNode->createAgeUuid).AsString().c_str(), 64);
}
return fCreateAgeGuid;

3
Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.cpp
View File

@ -164,7 +164,8 @@ const char * pyVaultPlayerInfoNode::Player_GetAgeGuid( void )
return "";
VaultPlayerInfoNode playerInfo(fNode);
GuidToString(playerInfo.ageInstUuid, ansiAgeInstUuid, arrsize(ansiAgeInstUuid));
strncpy(ansiAgeInstUuid, plUUID(playerInfo.ageInstUuid).AsString().c_str(), 64);
return ansiAgeInstUuid;
}

2
Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.h
View File

@ -55,7 +55,7 @@ class pyVaultPlayerInfoNode : public pyVaultNode
{
mutable char * ansiPlayerName;
mutable char * ansiAgeInstName;
mutable char ansiAgeInstUuid[256];
mutable char ansiAgeInstUuid[64];
protected:
// should only be created from C++ side