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

Add proper member access control to NetVaultNode

Browse Source
This commit is contained in:
Michael Hansen
2013-01-05 12:06:21 -08:00
parent 5f4f9b9f5f
commit ca916fee49
27 changed files with 847 additions and 1656 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2436,15 +2436,15 @@ void cyMisc::RemovePublicAge( const char * ageInstanceGuid, PyObject * cbObject/
int cyMisc::GetKILevel()
{
int result = pfKIMsg::kNanoKI;
wchar_t wStr[MAX_PATH];
StrToUnicode(wStr, pfKIMsg::kChronicleKILevel, arrsize(wStr));
if (RelVaultNode * rvn = VaultFindChronicleEntryIncRef(wStr)) {
VaultChronicleNode chron(rvn);
result = wcstol(chron.entryValue, nil, 0);
result = wcstol(chron.GetEntryValue(), nil, 0);
rvn->DecRef();
}
return result;
}
@ -2828,7 +2828,7 @@ void cyMisc::SendFriendInvite(const wchar_t email[], const wchar_t toName[])
if (RelVaultNode* pNode = VaultGetPlayerNodeIncRef())
{
VaultPlayerNode player(pNode);
plUUID inviteUuid(player.inviteUuid);
plUUID inviteUuid = player.GetInviteUuid();
// If we don't have an invite UUID set then make a new one
if (inviteUuid.IsNull())

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

@ -189,7 +189,7 @@ plUUID pyAgeVault::GetAgeGuid( void )
RelVaultNode * rvn = VaultGetAgeInfoNodeIncRef();
if (rvn) {
VaultAgeInfoNode ageInfo(rvn);
plUUID uuid = plUUID(ageInfo.ageInstUuid);
plUUID uuid = ageInfo.GetAgeInstanceGuid();
rvn->DecRef();
return uuid;
}

4
Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.cpp
View File

@ -94,7 +94,7 @@ const char * pyDniInfoSource::GetAgeName( void ) const
VaultAgeInfoNode ageInfo(node);
fAgeName = StrDupToAnsi(ageInfo.ageInstName);
fAgeName = StrDupToAnsi(ageInfo.GetAgeInstanceName());
node->DecRef();
return fAgeName;
@ -105,7 +105,7 @@ plUUID pyDniInfoSource::GetAgeGuid( void ) const
if (RelVaultNode * node = VaultGetAgeInfoNodeIncRef())
{
VaultAgeInfoNode ageInfo(node);
plUUID uuid = plUUID(ageInfo.ageInstUuid);
plUUID uuid = ageInfo.GetAgeInstanceGuid();
node->DecRef();
return uuid;

8
Sources/Plasma/FeatureLib/pfPython/pyGameScore.cpp
View File

@ -127,7 +127,7 @@ void pyGameScore::CreateAgeScore(const plString& name, uint32_t type, int32_t po
{
if (RelVaultNode* ageInfo = VaultGetAgeInfoNodeIncRef())
{
uint32_t ownerId = ageInfo->nodeId;
uint32_t ownerId = ageInfo->GetNodeId();
pfGameScore::Create(ownerId, name, type, points, rcvr.getKey());
ageInfo->DecRef();
} else
@ -143,7 +143,7 @@ void pyGameScore::CreatePlayerScore(const plString& name, uint32_t type, int32_t
{
if (RelVaultNode* node = VaultGetPlayerInfoNodeIncRef())
{
uint32_t ownerId = node->nodeId;
uint32_t ownerId = node->GetNodeId();
pfGameScore::Create(ownerId, name, type, points, rcvr.getKey());
node->DecRef();
} else
@ -159,7 +159,7 @@ void pyGameScore::FindAgeScores(const plString& name, pyKey& rcvr)
{
if (RelVaultNode* ageInfo = VaultGetAgeInfoNodeIncRef())
{
uint32_t ownerId = ageInfo->nodeId;
uint32_t ownerId = ageInfo->GetNodeId();
pfGameScore::Find(ownerId, name, rcvr.getKey());
ageInfo->DecRef();
} else
@ -175,7 +175,7 @@ void pyGameScore::FindPlayerScores(const plString& name, pyKey& rcvr)
{
if (RelVaultNode* node = VaultGetPlayerInfoNodeIncRef())
{
uint32_t ownerId = node->nodeId;
uint32_t ownerId = node->GetNodeId();
pfGameScore::Find(ownerId, name, rcvr.getKey());
node->DecRef();
}

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

@ -225,11 +225,11 @@ PyObject* pyVault::GetKIUsage(void)
RelVaultNode ** end = nodeArr.Term();
for (; cur != end; ++cur) {
RelVaultNode * rvn = *cur;
if (rvn->nodeType == plVault::kNodeType_Image)
if (rvn->GetNodeType() == plVault::kNodeType_Image)
++pictures;
else if (rvn->nodeType == plVault::kNodeType_TextNote)
else if (rvn->GetNodeType() == plVault::kNodeType_TextNote)
++notes;
else if (rvn->nodeType == plVault::kNodeType_MarkerGame)
else if (rvn->GetNodeType() == plVault::kNodeType_MarkerGame)
++markerGames;
rvn->DecRef();
}
@ -385,7 +385,7 @@ void pyVault::SendToDevice( pyVaultNode& node, const char * deviceName )
StrToUnicode(wDevName, deviceName, arrsize(wDevName));
// Note: This actually blocks (~Hoikas)
VaultPublishNode(node.GetNode()->nodeId, wDevName);
VaultPublishNode(node.GetNode()->GetNodeId(), wDevName);
}
@ -433,10 +433,10 @@ PyObject* pyVault::GetPsnlAgeSDL() const
PyObject * result = nil;
NetVaultNode * templateNode = new NetVaultNode;
templateNode->IncRef();
if (RelVaultNode * rvnFldr = VaultGetAgesIOwnFolderIncRef()) {
templateNode->fieldFlags = 0;
templateNode->ClearFieldFlags();
templateNode->SetNodeType(plVault::kNodeType_AgeInfo);
VaultAgeInfoNode ageInfo(templateNode);
wchar_t str[MAX_PATH];
@ -444,8 +444,8 @@ PyObject* pyVault::GetPsnlAgeSDL() const
ageInfo.SetAgeFilename(str);
if (RelVaultNode * rvnInfo = rvnFldr->GetChildNodeIncRef(templateNode, 2)) {
templateNode->fieldFlags = 0;
templateNode->ClearFieldFlags();
templateNode->SetNodeType(plVault::kNodeType_SDL);
if (RelVaultNode * rvnSdl = rvnInfo->GetChildNodeIncRef(templateNode, 1)) {
@ -478,10 +478,10 @@ void pyVault::UpdatePsnlAgeSDL( pySDLStateDataRecord & pyrec )
NetVaultNode * templateNode = new NetVaultNode;
templateNode->IncRef();
if (RelVaultNode * rvnFldr = VaultGetAgesIOwnFolderIncRef()) {
templateNode->fieldFlags = 0;
templateNode->ClearFieldFlags();
templateNode->SetNodeType(plVault::kNodeType_AgeInfo);
VaultAgeInfoNode ageInfo(templateNode);
wchar_t str[MAX_PATH];
@ -489,8 +489,8 @@ void pyVault::UpdatePsnlAgeSDL( pySDLStateDataRecord & pyrec )
ageInfo.SetAgeFilename(str);
if (RelVaultNode * rvnInfo = rvnFldr->GetChildNodeIncRef(templateNode, 2)) {
templateNode->fieldFlags = 0;
templateNode->ClearFieldFlags();
templateNode->SetNodeType(plVault::kNodeType_SDL);
if (RelVaultNode * rvnSdl = rvnInfo->GetChildNodeIncRef(templateNode, 1)) {

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

@ -189,7 +189,7 @@ const char * pyVaultAgeInfoNode::GetAgeFilename() const
if (fNode) {
char str[MAX_PATH];
VaultAgeInfoNode access(fNode);
StrToAnsi(str, access.ageFilename, arrsize(str));
StrToAnsi(str, access.GetAgeFilename(), arrsize(str));
fAgeFilename = str;
}
return fAgeFilename.c_str();
@ -204,7 +204,7 @@ const char * pyVaultAgeInfoNode::GetAgeInstanceName() const
if (fNode) {
char str[MAX_PATH];
VaultAgeInfoNode access(fNode);
StrToAnsi(str, access.ageInstName, arrsize(str));
StrToAnsi(str, access.GetAgeInstanceName(), arrsize(str));
fAgeInstName = str;
}
return fAgeInstName.c_str();
@ -219,7 +219,7 @@ const char * pyVaultAgeInfoNode::GetAgeUserDefinedName() const
if (fNode) {
char str[MAX_PATH];
VaultAgeInfoNode access(fNode);
StrToAnsi(str, access.ageUserDefinedName, arrsize(str));
StrToAnsi(str, access.GetAgeUserDefinedName(), arrsize(str));
fAgeUserName = str;
}
return fAgeUserName.c_str();
@ -234,7 +234,7 @@ plUUID pyVaultAgeInfoNode::GetAgeInstanceGuid() const
if (fNode) {
VaultAgeInfoNode access(fNode);
return plUUID(access.ageInstUuid);
return access.GetAgeInstanceGuid();
}
return kNilUuid;
}
@ -249,7 +249,7 @@ const char * pyVaultAgeInfoNode::GetAgeDescription() const
char str[MAX_PATH];
memset(str, 0, sizeof(str));
VaultAgeInfoNode access(fNode);
StrToAnsi(str, access.ageDescription, arrsize(str));
StrToAnsi(str, access.GetAgeDescription(), arrsize(str));
fAgeDescription = str;
}
return fAgeDescription.c_str();
@ -263,9 +263,9 @@ int32_t pyVaultAgeInfoNode::GetSequenceNumber() const
{
if (!fNode)
return -1;
VaultAgeInfoNode access(fNode);
return access.ageSequenceNumber;
return access.GetAgeSequenceNumber();
}
void pyVaultAgeInfoNode::SetSequenceNumber( int32_t v )
@ -276,9 +276,9 @@ int32_t pyVaultAgeInfoNode::GetAgeLanguage() const
{
if (!fNode)
return -1;
VaultAgeInfoNode access(fNode);
return access.ageLanguage;
return access.GetAgeLanguage();
}
void pyVaultAgeInfoNode::SetAgeLanguage( int32_t v )
@ -305,7 +305,7 @@ bool pyVaultAgeInfoNode::IsPublic() const
{
if (fNode) {
VaultAgeInfoNode access(fNode);
return access.ageIsPublic;
return access.GetIsPublic();
}
return false;
}
@ -315,10 +315,10 @@ const char * pyVaultAgeInfoNode::GetDisplayName() const
if (fNode) {
char str[MAX_PATH];
VaultAgeInfoNode access(fNode);
if (access.ageSequenceNumber > 0)
StrPrintf(str, arrsize(str), "%S(%d) %S", access.ageUserDefinedName, access.ageSequenceNumber, access.ageInstName);
if (access.GetAgeSequenceNumber() > 0)
StrPrintf(str, arrsize(str), "%S(%d) %S", access.GetAgeUserDefinedName(), access.GetAgeSequenceNumber(), access.GetAgeInstanceName());
else
StrPrintf(str, arrsize(str), "%S %S", access.ageUserDefinedName, access.ageInstName);
StrPrintf(str, arrsize(str), "%S %S", access.GetAgeUserDefinedName(), access.GetAgeInstanceName());
fAgeDispName = str;
}
return fAgeDispName.c_str();

4
Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.cpp
View File

@ -109,7 +109,7 @@ bool pyVaultAgeLinkNode::GetLocked() const
return false;
VaultAgeLinkNode access(fNode);
return !access.unlocked;
return !access.GetUnlocked();
}
void pyVaultAgeLinkNode::SetVolatile( bool v )
@ -127,7 +127,7 @@ bool pyVaultAgeLinkNode::GetVolatile() const
return false;
VaultAgeLinkNode access(fNode);
return access.volat;
return access.GetVolatile();
}
void pyVaultAgeLinkNode::AddSpawnPoint( pySpawnPointInfo & point )

8
Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.cpp
View File

@ -97,7 +97,7 @@ const char * pyVaultChronicleNode::Chronicle_GetName( void )
free(ansiName);
VaultChronicleNode chron(fNode);
ansiName = StrDupToAnsi(chron.entryName);
ansiName = StrDupToAnsi(chron.GetEntryName());
return ansiName;
}
@ -123,10 +123,10 @@ const char * pyVaultChronicleNode::Chronicle_GetValue( void )
VaultChronicleNode chron(fNode);
if (!chron.entryValue)
if (!chron.GetEntryValue())
return "";
ansiValue = StrDupToAnsi(chron.entryValue);
ansiValue = StrDupToAnsi(chron.GetEntryValue());
return ansiValue;
}
@ -145,5 +145,5 @@ uint32_t pyVaultChronicleNode::Chronicle_GetType( void )
return 0;
VaultChronicleNode chron(fNode);
return chron.entryType;
return chron.GetEntryType();
}

10
Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.cpp
View File

@ -84,7 +84,7 @@ int pyVaultFolderNode::Folder_GetType( void )
return 0;
VaultFolderNode folder(fNode);
return folder.folderType;
return folder.GetFolderType();
}
void pyVaultFolderNode::Folder_SetName( std::string name )
@ -113,11 +113,11 @@ std::string pyVaultFolderNode::Folder_GetName( void )
return "";
VaultFolderNode folder(fNode);
if (!folder.folderName)
if (!folder.GetFolderName())
return "";
std::string retVal;
char* sName = hsWStringToString(folder.folderName);
char* sName = hsWStringToString(folder.GetFolderName());
retVal = sName;
delete [] sName;
return retVal;
@ -129,8 +129,8 @@ std::wstring pyVaultFolderNode::Folder_GetNameW( void )
return L"";
VaultFolderNode folder(fNode);
if (!folder.folderName)
if (!folder.GetFolderName())
return L"";
return folder.folderName;
return folder.GetFolderName();
}

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

@ -141,9 +141,9 @@ std::string pyVaultImageNode::Image_GetTitle( void )
VaultImageNode image(fNode);
std::string retVal = "";
if (image.title)
if (image.GetImageTitle())
{
char* temp = hsWStringToString(image.title);
char* temp = hsWStringToString(image.GetImageTitle());
retVal = temp;
delete [] temp;
}
@ -157,7 +157,7 @@ std::wstring pyVaultImageNode::Image_GetTitleW( void )
return L"";
VaultImageNode image(fNode);
return image.title ? image.title : L"";
return image.GetImageTitle() ? image.GetImageTitle() : L"";
}
PyObject* pyVaultImageNode::Image_GetImage( void )
@ -170,7 +170,7 @@ PyObject* pyVaultImageNode::Image_GetImage( void )
if (access.ExtractImage(&fMipmap)) {
fMipmapKey = fMipmap->GetKey();
if (!fMipmapKey)
fMipmapKey = CreateAndRefImageKey(fNode->nodeId, fMipmap);
fMipmapKey = CreateAndRefImageKey(fNode->GetNodeId(), fMipmap);
else
fMipmapKey->RefObject();
}
@ -199,7 +199,7 @@ void pyVaultImageNode::Image_SetImage(pyImage& image)
fMipmapKey = image.GetKey();
if (!fMipmapKey)
fMipmapKey = CreateAndRefImageKey(fNode->nodeId, fMipmap);
fMipmapKey = CreateAndRefImageKey(fNode->GetNodeId(), fMipmap);
else
fMipmapKey->RefObject();
}
@ -243,7 +243,7 @@ void pyVaultImageNode::SetImageFromScrShot()
if (cyMisc::GetPipeline()->CaptureScreen(fMipmap, false, 800, 600)) {
fMipmapKey = fMipmap->GetKey();
if (!fMipmapKey)
fMipmapKey = CreateAndRefImageKey(fNode->nodeId, fMipmap);
fMipmapKey = CreateAndRefImageKey(fNode->GetNodeId(), fMipmap);
else
fMipmapKey->RefObject();
access.StuffImage(fMipmap);

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

@ -74,7 +74,7 @@ const char * pyVaultMarkerGameNode::GetGameName () const
if (fNode) {
VaultMarkerGameNode access(fNode);
StrToAnsi(fGameName, access.gameName, arrsize(fGameName));
StrToAnsi(fGameName, access.GetGameName(), arrsize(fGameName));
}
return fGameName;
}
@ -93,7 +93,7 @@ plUUID pyVaultMarkerGameNode::GetGameGuid() const
{
if (fNode) {
VaultMarkerGameNode access(fNode);
return access.gameGuid;
return access.GetGameGuid();
}
return kNilUuid;
}

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

@ -208,7 +208,7 @@ bool pyVaultNode::operator==(const pyVaultNode &vaultNode) const
return true;
if (ours == nil || theirs == nil)
return false;
if (ours->nodeId == theirs->nodeId)
if (ours->GetNodeId() == theirs->GetNodeId())
return true;
return ours->Matches(theirs);
}
@ -217,14 +217,14 @@ bool pyVaultNode::operator==(const pyVaultNode &vaultNode) const
uint32_t pyVaultNode::GetID( void )
{
if (fNode)
return fNode->nodeId;
return fNode->GetNodeId();
return 0;
}
uint32_t pyVaultNode::GetType( void )
{
if (fNode)
return fNode->nodeType;
return fNode->GetNodeType();
return 0;
}
@ -254,14 +254,14 @@ PyObject* pyVaultNode::GetOwnerNode( void )
uint32_t pyVaultNode::GetModifyTime( void )
{
if (fNode)
return fNode->modifyTime;
return fNode->GetModifyTime();
return 0;
}
uint32_t pyVaultNode::GetCreatorNodeID( void )
{
if (fNode)
return fNode->creatorId;
return fNode->GetCreatorId();
return 0;
}
@ -274,7 +274,7 @@ PyObject* pyVaultNode::GetCreatorNode( void )
templateNode->IncRef();
templateNode->SetNodeType(plVault::kNodeType_PlayerInfo);
VaultPlayerInfoNode plrInfo(templateNode);
plrInfo.SetPlayerId(fNode->creatorId);
plrInfo.SetPlayerId(fNode->GetCreatorId());
if (RelVaultNode * rvn = VaultGetNodeIncRef(templateNode)) {
result = pyVaultPlayerInfoNode::New(rvn);
@ -293,7 +293,7 @@ PyObject* pyVaultNode::GetCreatorNode( void )
uint32_t pyVaultNode::GetCreateTime( void )
{
if (fNode)
return fNode->createTime;
return fNode->GetCreateTime();
return 0;
}
@ -314,8 +314,8 @@ const char * pyVaultNode::GetCreateAgeName( void )
return fCreateAgeName;
if (fNode) {
if (fNode->createAgeName)
fCreateAgeName = StrDupToAnsi(fNode->createAgeName);
if (fNode->GetCreateAgeName())
fCreateAgeName = StrDupToAnsi(fNode->GetCreateAgeName());
else
fCreateAgeName = StrDup("");
}
@ -326,7 +326,7 @@ const char * pyVaultNode::GetCreateAgeName( void )
plUUID pyVaultNode::GetCreateAgeGuid(void) const
{
if (fNode) {
return fNode->createAgeUuid;
return fNode->GetCreateAgeUuid();
}
return kNilUuid;
@ -336,7 +336,7 @@ PyObject* pyVaultNode::GetCreateAgeCoords () {
if (!fNode)
PYTHON_RETURN_NONE;
return pyDniCoordinates::New(nil);
return pyDniCoordinates::New(nil);
}
void pyVaultNode::SetID( uint32_t v )
@ -347,7 +347,7 @@ void pyVaultNode::SetID( uint32_t v )
void pyVaultNode::SetType( int v )
{
ASSERT(fNode);
if (fNode->nodeId) {
if (fNode->GetNodeId()) {
FATAL("pyVaultNode: You may not change the type of a vault node");
return;
}
@ -363,7 +363,7 @@ void pyVaultNode::SetOwnerNodeID( uint32_t v )
void pyVaultNode::SetCreatorNodeID( uint32_t v )
{
ASSERT(fNode);
if (fNode->nodeId) {
if (fNode->GetNodeId()) {
FATAL("pyVaultNode: You may not change the type of a vault node");
return;
}
@ -415,7 +415,7 @@ PyObject* pyVaultNode::AddNode(pyVaultNode* pynode, PyObject* cbObject, uint32_t
if ( !pynode->GetID() )
{
// Block here until node is created and fetched =(
ASSERT(pynode->GetNode()->nodeType);
ASSERT(pynode->GetNode()->GetNodeType());
ENetError result;
RelVaultNode * newNode = VaultCreateNodeAndWaitIncRef(
pynode->GetNode(),
@ -435,10 +435,10 @@ PyObject* pyVaultNode::AddNode(pyVaultNode* pynode, PyObject* cbObject, uint32_t
PyObject* nodeRef = cb->fPyNodeRef = pyVaultNodeRef::New(fNode, pynode->fNode);
Py_INCREF(nodeRef); // The callback steals the ref, according to Eric...
cb->SetNode(pynode->fNode);
VaultAddChildNode(fNode->nodeId,
pynode->fNode->nodeId,
NetCommGetPlayer()->playerInt,
VaultAddChildNode(fNode->GetNodeId(),
pynode->fNode->GetNodeId(),
NetCommGetPlayer()->playerInt,
(FVaultAddChildNodeCallback)_AddNodeCallback,
cb
);
@ -474,8 +474,8 @@ void pyVaultNode::LinkToNode(int nodeID, PyObject* cbObject, uint32_t cbContext)
rvn->DecRef();
}
VaultAddChildNode(fNode->nodeId,
nodeID,
VaultAddChildNode(fNode->GetNodeId(),
nodeID,
NetCommGetPlayer()->playerInt,
(FVaultAddChildNodeCallback)_AddNodeCallback,
cb
@ -499,7 +499,7 @@ bool pyVaultNode::RemoveNode( pyVaultNode& pynode, PyObject* cbObject, uint32_t
// Hack the callbacks until vault notification is in place
cb->VaultOperationStarted( cbContext );
VaultRemoveChildNode(fNode->nodeId, pynode.fNode->nodeId, nil, nil);
VaultRemoveChildNode(fNode->GetNodeId(), pynode.fNode->GetNodeId(), nil, nil);
cb->SetNode(pynode.fNode);
cb->fPyNodeRef = pyVaultNodeRef::New(fNode, pynode.fNode);
@ -525,7 +525,7 @@ void pyVaultNode::RemoveAllNodes( void )
ARRAY(unsigned) nodeIds;
fNode->GetChildNodeIds(&nodeIds, 1);
for (unsigned i = 0; i < nodeIds.Count(); ++i)
VaultRemoveChildNode(fNode->nodeId, nodeIds[i], nil, nil);
VaultRemoveChildNode(fNode->GetNodeId(), nodeIds[i], nil, nil);
}
// Add/Save this node to vault
@ -533,7 +533,7 @@ void pyVaultNode::Save(PyObject* cbObject, uint32_t cbContext)
{
// If the node doesn't have an id, then use it as a template to create the node in the vault,
// otherwise just ignore the save request since vault nodes are now auto-saved.
if (!fNode->nodeId && fNode->nodeType) {
if (!fNode->GetNodeId() && fNode->GetNodeType()) {
ENetError result;
if (RelVaultNode * node = VaultCreateNodeAndWaitIncRef(fNode, &result)) {
fNode->DecRef();
@ -557,7 +557,7 @@ void pyVaultNode::SaveAll(PyObject* cbObject, uint32_t cbContext)
void pyVaultNode::ForceSave()
{
if (!fNode->nodeId && fNode->nodeType) {
if (!fNode->GetNodeId() && fNode->GetNodeType()) {
ENetError result;
if (RelVaultNode * node = VaultCreateNodeAndWaitIncRef(fNode, &result)) {
fNode->DecRef();
@ -576,7 +576,7 @@ void pyVaultNode::SendTo(uint32_t destClientNodeID, PyObject* cbObject, uint32_t
if (fNode)
{
// If the node doesn't have an id, then use it as a template to create the node in the vault,
if (!fNode->nodeId && fNode->nodeType) {
if (!fNode->GetNodeId() && fNode->GetNodeType()) {
ENetError result;
if (RelVaultNode * node = VaultCreateNodeAndWaitIncRef(fNode, &result)) {
fNode->DecRef();
@ -717,9 +717,9 @@ PyObject* pyVaultNode::UpcastToFolderNode()
if (!fNode)
PYTHON_RETURN_NONE;
if (
fNode->nodeType != plVault::kNodeType_Folder &&
fNode->nodeType != plVault::kNodeType_AgeInfoList &&
fNode->nodeType != plVault::kNodeType_PlayerInfoList
fNode->GetNodeType() != plVault::kNodeType_Folder &&
fNode->GetNodeType() != plVault::kNodeType_AgeInfoList &&
fNode->GetNodeType() != plVault::kNodeType_PlayerInfoList
)
PYTHON_RETURN_NONE;
@ -730,7 +730,7 @@ PyObject* pyVaultNode::UpcastToPlayerInfoListNode()
{
if (!fNode)
PYTHON_RETURN_NONE;
if (fNode->nodeType != plVault::kNodeType_PlayerInfoList)
if (fNode->GetNodeType() != plVault::kNodeType_PlayerInfoList)
PYTHON_RETURN_NONE;
return pyVaultPlayerInfoListNode::New(fNode);
@ -740,7 +740,7 @@ PyObject* pyVaultNode::UpcastToImageNode()
{
if (!fNode)
PYTHON_RETURN_NONE;
if (fNode->nodeType != plVault::kNodeType_Image)
if (fNode->GetNodeType() != plVault::kNodeType_Image)
PYTHON_RETURN_NONE;
return pyVaultImageNode::New(fNode);
@ -750,7 +750,7 @@ PyObject* pyVaultNode::UpcastToTextNoteNode()
{
if (!fNode)
PYTHON_RETURN_NONE;
if (fNode->nodeType != plVault::kNodeType_TextNote)
if (fNode->GetNodeType() != plVault::kNodeType_TextNote)
PYTHON_RETURN_NONE;
return pyVaultTextNoteNode::New(fNode);
@ -760,7 +760,7 @@ PyObject* pyVaultNode::UpcastToAgeLinkNode()
{
if (!fNode)
PYTHON_RETURN_NONE;
if (fNode->nodeType != plVault::kNodeType_AgeLink)
if (fNode->GetNodeType() != plVault::kNodeType_AgeLink)
PYTHON_RETURN_NONE;
return pyVaultAgeLinkNode::New(fNode);
@ -770,7 +770,7 @@ PyObject* pyVaultNode::UpcastToChronicleNode()
{
if (!fNode)
PYTHON_RETURN_NONE;
if (fNode->nodeType != plVault::kNodeType_Chronicle)
if (fNode->GetNodeType() != plVault::kNodeType_Chronicle)
PYTHON_RETURN_NONE;
return pyVaultChronicleNode::New(fNode);
@ -780,7 +780,7 @@ PyObject* pyVaultNode::UpcastToPlayerInfoNode()
{
if (!fNode)
PYTHON_RETURN_NONE;
if (fNode->nodeType != plVault::kNodeType_PlayerInfo)
if (fNode->GetNodeType() != plVault::kNodeType_PlayerInfo)
PYTHON_RETURN_NONE;
return pyVaultPlayerInfoNode::New(fNode);
@ -790,7 +790,7 @@ PyObject* pyVaultNode::UpcastToMarkerGameNode()
{
if (!fNode)
PYTHON_RETURN_NONE;
if (fNode->nodeType != plVault::kNodeType_MarkerGame)
if (fNode->GetNodeType() != plVault::kNodeType_MarkerGame)
PYTHON_RETURN_NONE;
return pyVaultMarkerGameNode::New(fNode);
@ -800,7 +800,7 @@ PyObject* pyVaultNode::UpcastToAgeInfoNode()
{
if (!fNode)
PYTHON_RETURN_NONE;
if (fNode->nodeType != plVault::kNodeType_AgeInfo)
if (fNode->GetNodeType() != plVault::kNodeType_AgeInfo)
PYTHON_RETURN_NONE;
return pyVaultAgeInfoNode::New(fNode);
@ -810,7 +810,7 @@ PyObject* pyVaultNode::UpcastToAgeInfoListNode()
{
if (!fNode)
PYTHON_RETURN_NONE;
if (fNode->nodeType != plVault::kNodeType_AgeInfoList)
if (fNode->GetNodeType() != plVault::kNodeType_AgeInfoList)
PYTHON_RETURN_NONE;
return pyVaultAgeInfoListNode::New(fNode);
@ -820,7 +820,7 @@ PyObject* pyVaultNode::UpcastToSDLNode()
{
if (!fNode)
PYTHON_RETURN_NONE;
if (fNode->nodeType != plVault::kNodeType_SDL)
if (fNode->GetNodeType() != plVault::kNodeType_SDL)
PYTHON_RETURN_NONE;
return pyVaultSDLNode::New(fNode);
@ -830,7 +830,7 @@ PyObject* pyVaultNode::UpcastToPlayerNode()
{
if (!fNode)
PYTHON_RETURN_NONE;
if (fNode->nodeType != plVault::kNodeType_VNodeMgrPlayer)
if (fNode->GetNodeType() != plVault::kNodeType_VNodeMgrPlayer)
PYTHON_RETURN_NONE;
return pyVaultPlayerNode::New(fNode);
@ -841,7 +841,7 @@ PyObject* pyVaultNode::UpcastToSystemNode()
{
if (!fNode)
PYTHON_RETURN_NONE;
if (fNode->nodeType != plVault::kNodeType_System)
if (fNode->GetNodeType() != plVault::kNodeType_System)
PYTHON_RETURN_NONE;
return pyVaultSystemNode::New(fNode);

20
Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.cpp
View File

@ -99,22 +99,22 @@ PyObject* pyVaultNodeRef::GetChild( void )
unsigned pyVaultNodeRef::GetParentID () {
if (!fParent)
return 0;
return fParent->nodeId;
return fParent->GetNodeId();
}
unsigned pyVaultNodeRef::GetChildID () {
if (!fChild)
return 0;
return fChild->nodeId;
return fChild->GetNodeId();
}
unsigned pyVaultNodeRef::GetSaverID () {
if (!fParent || !fChild)
return 0;
unsigned saverId = 0;
if (RelVaultNode * child = VaultGetNodeIncRef(fChild->nodeId)) {
saverId = child->GetRefOwnerId(fParent->nodeId);
unsigned saverId = 0;
if (RelVaultNode * child = VaultGetNodeIncRef(fChild->GetNodeId())) {
saverId = child->GetRefOwnerId(fParent->GetNodeId());
child->DecRef();
}
return saverId;
@ -124,9 +124,9 @@ PyObject * pyVaultNodeRef::GetSaver () {
if (!fParent || !fChild)
return 0;
RelVaultNode * saver = nil;
if (RelVaultNode * child = VaultGetNodeIncRef(fChild->nodeId)) {
if (unsigned saverId = child->GetRefOwnerId(fParent->nodeId)) {
RelVaultNode * saver = nil;
if (RelVaultNode * child = VaultGetNodeIncRef(fChild->GetNodeId())) {
if (unsigned saverId = child->GetRefOwnerId(fParent->GetNodeId())) {
// Find the player info node representing the saver
NetVaultNode * templateNode = new NetVaultNode;
templateNode->IncRef();
@ -163,6 +163,6 @@ bool pyVaultNodeRef::BeenSeen () {
void pyVaultNodeRef::SetSeen (bool v) {
if (!fParent || !fChild)
return;
fParent->SetSeen(fChild->nodeId, v);
fParent->SetSeen(fChild->GetNodeId(), v);
}

6
Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.cpp
View File

@ -114,7 +114,7 @@ bool pyVaultPlayerInfoListNode::AddPlayer( uint32_t playerID )
VaultFindNodesAndWait(templateNode, &nodeIds);
if (nodeIds.Count())
VaultAddChildNodeAndWait(fNode->nodeId, nodeIds[0], VaultGetPlayerId());
VaultAddChildNodeAndWait(fNode->GetNodeId(), nodeIds[0], VaultGetPlayerId());
templateNode->DecRef();
return nodeIds.Count() != 0;
@ -130,9 +130,9 @@ void pyVaultPlayerInfoListNode::RemovePlayer( uint32_t playerID )
templateNode->SetNodeType(plVault::kNodeType_PlayerInfo);
VaultPlayerInfoNode access(templateNode);
access.SetPlayerId(playerID);
if (RelVaultNode * rvn = fNode->GetChildNodeIncRef(templateNode, 1)) {
VaultRemoveChildNode(fNode->nodeId, rvn->nodeId, nil, nil);
VaultRemoveChildNode(fNode->GetNodeId(), rvn->GetNodeId(), nil, nil);
rvn->DecRef();
}

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

@ -94,7 +94,7 @@ uint32_t pyVaultPlayerInfoNode::Player_GetPlayerID( void )
return 0;
VaultPlayerInfoNode playerInfo(fNode);
return playerInfo.playerId;
return playerInfo.GetPlayerId();
}
void pyVaultPlayerInfoNode::Player_SetPlayerName( const char * name )
@ -114,11 +114,11 @@ const char * pyVaultPlayerInfoNode::Player_GetPlayerName( void )
return "";
VaultPlayerInfoNode playerInfo(fNode);
if (!playerInfo.playerName)
if (!playerInfo.GetPlayerName())
return "";
free(ansiPlayerName);
ansiPlayerName = StrDupToAnsi(playerInfo.playerName);
ansiPlayerName = StrDupToAnsi(playerInfo.GetPlayerName());
return ansiPlayerName;
}
@ -129,7 +129,7 @@ void pyVaultPlayerInfoNode::Player_SetAgeInstanceName( const char * agename )
return;
wchar_t * wStr = StrDupToUnicode(agename);
VaultPlayerInfoNode playerInfo(fNode);
VaultPlayerInfoNode playerInfo(fNode);
playerInfo.SetAgeInstName(wStr);
free(wStr);
}
@ -140,11 +140,11 @@ const char * pyVaultPlayerInfoNode::Player_GetAgeInstanceName( void )
return "";
VaultPlayerInfoNode playerInfo(fNode);
if (!playerInfo.ageInstName)
if (!playerInfo.GetAgeInstName())
return "";
free(ansiAgeInstName);
ansiAgeInstName = StrDupToAnsi(playerInfo.ageInstName);
ansiAgeInstName = StrDupToAnsi(playerInfo.GetAgeInstName());
return ansiAgeInstName;
}
@ -162,7 +162,7 @@ plUUID pyVaultPlayerInfoNode::Player_GetAgeGuid(void) const
{
if (fNode) {
VaultPlayerInfoNode playerInfo(fNode);
return playerInfo.ageInstUuid;
return playerInfo.GetAgeInstUuid();
}
return kNilUuid;
}
@ -183,7 +183,7 @@ bool pyVaultPlayerInfoNode::Player_IsOnline( void )
return false;
VaultPlayerInfoNode playerInfo(fNode);
return playerInfo.online;
return playerInfo.GetOnline();
}
int pyVaultPlayerInfoNode::Player_GetCCRLevel( void )
@ -192,5 +192,5 @@ int pyVaultPlayerInfoNode::Player_GetCCRLevel( void )
return 0;
VaultPlayerInfoNode playerInfo(fNode);
return playerInfo.ccrLevel;
return playerInfo.GetCCRLevel();
}

14
Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.cpp
View File

@ -266,8 +266,8 @@ std::string pyVaultPlayerNode::GetPlayerName()
return "";
VaultPlayerNode player(fNode);
char ansiStr[MAX_PATH];
StrToAnsi(ansiStr, player.playerName, arrsize(ansiStr));
char ansiStr[MAX_PATH];
StrToAnsi(ansiStr, player.GetPlayerName(), arrsize(ansiStr));
return ansiStr;
}
@ -282,8 +282,8 @@ std::string pyVaultPlayerNode::GetAvatarShapeName()
return "";
VaultPlayerNode player(fNode);
char ansiStr[MAX_PATH];
StrToAnsi(ansiStr, player.avatarShapeName, arrsize(ansiStr));
char ansiStr[MAX_PATH];
StrToAnsi(ansiStr, player.GetAvatarShapeName(), arrsize(ansiStr));
return ansiStr;
}
@ -298,7 +298,7 @@ bool pyVaultPlayerNode::IsDisabled()
return false;
VaultPlayerNode player(fNode);
return player.disabled;
return player.GetDisabled();
}
void pyVaultPlayerNode::SetOnlineTime(uint32_t value)
@ -312,7 +312,7 @@ uint32_t pyVaultPlayerNode::GetOnlineTime()
return 0;
VaultPlayerNode player(fNode);
return player.onlineTime;
return player.GetOnlineTime();
}
void pyVaultPlayerNode::SetExplorer (bool b) {
@ -328,5 +328,5 @@ bool pyVaultPlayerNode::IsExplorer () {
return false;
VaultPlayerNode player(fNode);
return player.explorer;
return player.GetExplorer();
}

4
Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.cpp
View File

@ -76,7 +76,7 @@ void pyVaultSDLNode::SetIdent( int v )
return;
VaultSDLNode sdl(fNode);
sdl.SetSdlIdent(v);
sdl.SetSDLIdent(v);
}
int pyVaultSDLNode::GetIdent() const
@ -85,7 +85,7 @@ int pyVaultSDLNode::GetIdent() const
return 0;
VaultSDLNode sdl(fNode);
return sdl.sdlIdent;
return sdl.GetSDLIdent();
}
PyObject * pyVaultSDLNode::GetStateDataRecord() const

24
Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.cpp
View File

@ -101,9 +101,9 @@ std::string pyVaultTextNoteNode::Note_GetTitle( void )
char * aStr = nil;
VaultTextNoteNode textNote(fNode);
if (textNote.noteTitle) {
if (textNote.GetNoteTitle()) {
std::string result;
aStr = StrDupToAnsi(textNote.noteTitle);
aStr = StrDupToAnsi(textNote.GetNoteTitle());
result = aStr;
free(aStr);
return result;
@ -117,8 +117,8 @@ std::wstring pyVaultTextNoteNode::Note_GetTitleW( void )
return L"";
VaultTextNoteNode textNote(fNode);
if (textNote.noteTitle)
return textNote.noteTitle;
if (textNote.GetNoteTitle())
return textNote.GetNoteTitle();
return L"";
}
@ -151,9 +151,9 @@ std::string pyVaultTextNoteNode::Note_GetText( void )
char * aStr = nil;
VaultTextNoteNode textNote(fNode);
if (textNote.noteText) {
if (textNote.GetNoteText()) {
std::string result;
aStr = StrDupToAnsi(textNote.noteText);
aStr = StrDupToAnsi(textNote.GetNoteText());
result = aStr;
free(aStr);
return result;
@ -167,8 +167,8 @@ std::wstring pyVaultTextNoteNode::Note_GetTextW( void )
return L"";
VaultTextNoteNode textNote(fNode);
if (textNote.noteText)
return textNote.noteText;
if (textNote.GetNoteText())
return textNote.GetNoteText();
return L"";
}
@ -185,9 +185,9 @@ int32_t pyVaultTextNoteNode::Note_GetType( void )
{
if (!fNode)
return 0;
VaultTextNoteNode textNote(fNode);
return textNote.noteType;
return textNote.GetNoteType();
}
void pyVaultTextNoteNode::Note_SetSubType( int32_t type )
@ -203,9 +203,9 @@ int32_t pyVaultTextNoteNode::Note_GetSubType( void )
{
if (!fNode)
return 0;
VaultTextNoteNode textNote(fNode);
return textNote.noteSubType;
return textNote.GetNoteSubType();
}
PyObject * pyVaultTextNoteNode::GetDeviceInbox() const