From acce8eaf4c84cf5337a1dfef96a67109e449be1b Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sat, 3 Jan 2015 17:48:16 -0500 Subject: [PATCH] Fix Python CreateAgeName corruption --- Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp | 4 ++-- Sources/Plasma/FeatureLib/pfPython/pyVaultNode.h | 2 +- Sources/Plasma/FeatureLib/pfPython/pyVaultNodeGlue.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp index ca37d89a..087e1ebe 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp @@ -285,10 +285,10 @@ uint32_t pyVaultNode::GetCreateAgeTime( void ) return GetCreateTime(); } -const char * pyVaultNode::GetCreateAgeName() +plString pyVaultNode::GetCreateAgeName() const { if (fNode) - return fNode->GetCreateAgeName().c_str(); + return fNode->GetCreateAgeName(); return ""; } diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.h index b63e6b80..a4f0d790 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.h @@ -137,7 +137,7 @@ public: PyObject* GetCreatorNode( void ); // returns pyVaultPlayerInfoNode uint32_t GetCreateTime( void ); uint32_t GetCreateAgeTime( void ); - const char * GetCreateAgeName( void ); + plString GetCreateAgeName() const; plUUID GetCreateAgeGuid(void) const; PyObject* GetCreateAgeCoords (); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeGlue.cpp index 172e0b46..d46c125b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeGlue.cpp @@ -149,7 +149,7 @@ PYTHON_METHOD_DEFINITION_NOARGS(ptVaultNode, getCreateAgeTime) PYTHON_METHOD_DEFINITION_NOARGS(ptVaultNode, getCreateAgeName) { - return PyString_FromString(self->fThis->GetCreateAgeName()); + return PyString_FromPlString(self->fThis->GetCreateAgeName()); } PYTHON_METHOD_DEFINITION_NOARGS(ptVaultNode, getCreateAgeGuid)