OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00
Code Releases Activity

Age Link info names => plString

Browse Source
This commit is contained in:
Michael Hansen
2014-01-12 15:13:04 -08:00
parent ff30c77ddd
commit ef04cfcf84
25 changed files with 195 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp
View File

@ -336,7 +336,7 @@ PF_CONSOLE_CMD( Net, // groupName
"Link to an age." ) // helpString
{
plAgeLinkStruct link;
link.GetAgeInfo()->SetAgeFilename( params[0] );
link.GetAgeInfo()->SetAgeFilename( (const char *)params[0] );
link.SetLinkingRules( plNetCommon::LinkingRules::kBasicLink );
plNetLinkingMgr::GetInstance()->LinkToAge( &link );
PrintString("Linking to age...");
@ -350,7 +350,7 @@ PF_CONSOLE_CMD( Net, // groupName
"Link to a specific age by guid." ) // helpString
{
plAgeLinkStruct link;
link.GetAgeInfo()->SetAgeFilename( params[0] );
link.GetAgeInfo()->SetAgeFilename( (const char *)params[0] );
//link.GetAgeInfo()->SetAgeInstanceName( params[0] );
//link.GetAgeInfo()->SetAgeUserDefinedName( params[0] );
plUUID guid( (const char *)params[1] );
@ -375,7 +375,7 @@ PF_CONSOLE_CMD( Net,
"Link to specified age using Original Age Linking Book rules" )
{
plAgeLinkStruct link;
link.GetAgeInfo()->SetAgeFilename( params[0] );
link.GetAgeInfo()->SetAgeFilename( (const char *)params[0] );
link.SpawnPoint() = plSpawnPointInfo( (const char *)params[1], (const char *)params[1] );
link.SetLinkingRules( plNetCommon::LinkingRules::kOriginalBook );
plNetLinkingMgr::GetInstance()->LinkToAge( &link );
@ -388,7 +388,7 @@ PF_CONSOLE_CMD( Net,
"Link to specified age using Personal Age Linking Book rules" )
{
plAgeLinkStruct link;
link.GetAgeInfo()->SetAgeFilename( params[0] );
link.GetAgeInfo()->SetAgeFilename( (const char *)params[0] );
link.SetLinkingRules( plNetCommon::LinkingRules::kOwnedBook );
plNetLinkingMgr::GetInstance()->LinkToAge( &link );
PrintString("Linking to age I own...");
@ -400,7 +400,7 @@ PF_CONSOLE_CMD( Net,
"Link to specified age using Personal Age Linking Book rules" )
{
plAgeLinkStruct link;
link.GetAgeInfo()->SetAgeFilename( params[0] );
link.GetAgeInfo()->SetAgeFilename( (const char *)params[0] );
link.SetLinkingRules( plNetCommon::LinkingRules::kVisitBook );
plNetLinkingMgr::GetInstance()->LinkToAge( &link );
PrintString("Linking to age I can visit...");
@ -412,7 +412,7 @@ PF_CONSOLE_CMD( Net,
"Link to a sub-age of the current age" )
{
plAgeLinkStruct link;
link.GetAgeInfo()->SetAgeFilename( params[0] );
link.GetAgeInfo()->SetAgeFilename( (const char *)params[0] );
link.SetLinkingRules( plNetCommon::LinkingRules::kSubAgeBook );
plNetLinkingMgr::GetInstance()->LinkToAge( &link );
PrintString("Linking to a sub-age...");
@ -481,7 +481,7 @@ PF_CONSOLE_CMD( Net,
plNetLinkingMgr * lm = plNetLinkingMgr::GetInstance();
plAgeInfoStruct info;
info.SetAgeFilename( params[0] );
info.SetAgeFilename( (const char *)params[0] );
plAgeLinkStruct link;
if (!VaultGetOwnedAgeLink(&info, &link)) {
@ -806,8 +806,8 @@ PF_CONSOLE_CMD( Net_Vault,
"Add an instance of the specified age to your bookshelf" )
{
plAgeLinkStruct link;
link.GetAgeInfo()->SetAgeFilename( params[0] );
link.GetAgeInfo()->SetAgeInstanceName( params[0] );
link.GetAgeInfo()->SetAgeFilename( (const char *)params[0] );
link.GetAgeInfo()->SetAgeInstanceName( (const char *)params[0] );
plUUID guid = plUUID::Generate();
link.GetAgeInfo()->SetAgeInstanceGuid( &guid);
link.SetSpawnPoint( kDefaultSpawnPoint );
@ -822,7 +822,7 @@ PF_CONSOLE_CMD( Net_Vault,
"Remove the specified age from your bookshelf" )
{
plAgeInfoStruct info;
info.SetAgeFilename( params[0] );
info.SetAgeFilename( (const char *)params[0] );
bool success = VaultUnregisterOwnedAgeAndWait(&info);
PrintStringF(PrintString, "Operation %s.", success ? "Successful" : "Failed");
}
@ -834,8 +834,8 @@ PF_CONSOLE_CMD( Net_Vault,
"Add an instance of the specified age to your private links" )
{
plAgeLinkStruct link;
link.GetAgeInfo()->SetAgeFilename( params[0] );
link.GetAgeInfo()->SetAgeInstanceName( params[0] );
link.GetAgeInfo()->SetAgeFilename( (const char *)params[0] );
link.GetAgeInfo()->SetAgeInstanceName( (const char *)params[0] );
plUUID guid = plUUID::Generate();
link.GetAgeInfo()->SetAgeInstanceGuid( &guid);
link.SetSpawnPoint( kDefaultSpawnPoint );
@ -850,7 +850,7 @@ PF_CONSOLE_CMD( Net_Vault,
"Remove all instances of the specified age from your private links" )
{
plAgeInfoStruct info;
info.SetAgeFilename( params[0] );
info.SetAgeFilename( (const char *)params[0] );
unsigned count = 0;
while (VaultUnregisterVisitAgeAndWait(&info))

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

@ -632,7 +632,7 @@ PyObject* cyMisc::GetAgeInfo()
}
const char* cyMisc::GetPrevAgeName()
plString cyMisc::GetPrevAgeName()
{
plNetLinkingMgr* nmgr = plNetLinkingMgr::GetInstance();
if (nmgr)
@ -641,7 +641,7 @@ const char* cyMisc::GetPrevAgeName()
if (als)
return als->GetAgeInfo()->GetAgeFilename();
}
return nil;
return plString::Null;
}
PyObject* cyMisc::GetPrevAgeInfo()

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

@ -300,7 +300,7 @@ public:
//
static const char* GetAgeName();
static PyObject* GetAgeInfo(); // returns pyAgeInfoStruct
static const char* GetPrevAgeName();
static plString GetPrevAgeName();
static PyObject* GetPrevAgeInfo();
// current time in current age
static uint32_t GetAgeTime( void );

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

@ -68,7 +68,7 @@ PYTHON_GLOBAL_METHOD_DEFINITION_NOARGS(PtGetAgeTime, "DEPRECIATED - use ptDniInf
PYTHON_GLOBAL_METHOD_DEFINITION_NOARGS(PtGetPrevAgeName, "Returns filename of previous age visited")
{
return PyString_FromString(cyMisc::GetPrevAgeName());
return PyString_FromPlString(cyMisc::GetPrevAgeName());
}
PYTHON_GLOBAL_METHOD_DEFINITION_NOARGS(PtGetPrevAgeInfo, "Returns ptAgeInfoStruct of previous age visited")

54
Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp
View File

@ -81,42 +81,42 @@ void pyAgeInfoStruct::CopyFromRef( const pyAgeInfoStructRef & other )
fAgeInfo.CopyFrom( other.GetAgeInfo() );
}
const char * pyAgeInfoStruct::GetAgeFilename() const
plString pyAgeInfoStruct::GetAgeFilename() const
{
return fAgeInfo.GetAgeFilename();
}
void pyAgeInfoStruct::SetAgeFilename( const char * v )
void pyAgeInfoStruct::SetAgeFilename( const plString & v )
{
fAgeInfo.SetAgeFilename( v );
}
const char * pyAgeInfoStruct::GetAgeInstanceName() const
plString pyAgeInfoStruct::GetAgeInstanceName() const
{
return fAgeInfo.GetAgeInstanceName();
}
void pyAgeInfoStruct::SetAgeInstanceName( const char * v )
void pyAgeInfoStruct::SetAgeInstanceName( const plString & v )
{
fAgeInfo.SetAgeInstanceName( v );
}
const char * pyAgeInfoStruct::GetAgeUserDefinedName() const
plString pyAgeInfoStruct::GetAgeUserDefinedName() const
{
return fAgeInfo.GetAgeUserDefinedName();
}
void pyAgeInfoStruct::SetAgeUserDefinedName( const char * v )
void pyAgeInfoStruct::SetAgeUserDefinedName( const plString & v )
{
fAgeInfo.SetAgeUserDefinedName( v );
}
const char * pyAgeInfoStruct::GetAgeDescription() const
plString pyAgeInfoStruct::GetAgeDescription() const
{
return fAgeInfo.GetAgeDescription();
}
void pyAgeInfoStruct::SetAgeDescription( const char * v )
void pyAgeInfoStruct::SetAgeDescription( const plString & v )
{
fAgeInfo.SetAgeDescription( v );
}
@ -132,12 +132,12 @@ void pyAgeInfoStruct::SetAgeInstanceGuid( const char * 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;
plString curInst = fAgeInfo.GetAgeInstanceName();
plString y = curInst + guid;
plMD5Checksum hash;
hash.Start();
hash.AddTo(y.length(), (uint8_t*)y.c_str());
hash.AddTo(y.GetSize(), (uint8_t*)y.c_str());
hash.Finish();
const char* md5sum = hash.GetAsHexString();
@ -180,9 +180,9 @@ void pyAgeInfoStruct::SetAgeLanguage( int32_t v )
plString pyAgeInfoStruct::GetDisplayName() const
{
const char* instance = GetAgeInstanceName();
const char* user = GetAgeUserDefinedName();
bool namesEqual = (stricmp(user, instance) == 0); // Ae'gura Ae'gura
plString instance = GetAgeInstanceName();
plString user = GetAgeUserDefinedName();
bool namesEqual = (user.CompareI(instance) == 0); // Ae'gura Ae'gura
if (namesEqual)
return instance;
@ -190,9 +190,9 @@ plString pyAgeInfoStruct::GetDisplayName() const
{
int32_t seq = GetAgeSequenceNumber();
if (seq > 0)
return plString::Format("%s (%d) %s", user, seq, instance);
return plString::Format("%s (%d) %s", user.c_str(), seq, instance.c_str());
else
return plString::Format("%s %s", user, instance);
return plString::Format("%s %s", user.c_str(), instance.c_str());
}
}
@ -211,32 +211,32 @@ void pyAgeInfoStructRef::CopyFromRef( const pyAgeInfoStructRef & other )
fAgeInfo.CopyFrom( other.GetAgeInfo() );
}
const char * pyAgeInfoStructRef::GetAgeFilename() const
plString pyAgeInfoStructRef::GetAgeFilename() const
{
return fAgeInfo.GetAgeFilename();
}
void pyAgeInfoStructRef::SetAgeFilename( const char * v )
void pyAgeInfoStructRef::SetAgeFilename( const plString & v )
{
fAgeInfo.SetAgeFilename( v );
}
const char * pyAgeInfoStructRef::GetAgeInstanceName() const
plString pyAgeInfoStructRef::GetAgeInstanceName() const
{
return fAgeInfo.GetAgeInstanceName();
}
void pyAgeInfoStructRef::SetAgeInstanceName( const char * v )
void pyAgeInfoStructRef::SetAgeInstanceName( const plString & v )
{
fAgeInfo.SetAgeInstanceName( v );
}
const char * pyAgeInfoStructRef::GetAgeUserDefinedName() const
plString pyAgeInfoStructRef::GetAgeUserDefinedName() const
{
return fAgeInfo.GetAgeUserDefinedName();
}
void pyAgeInfoStructRef::SetAgeUserDefinedName( const char * v )
void pyAgeInfoStructRef::SetAgeUserDefinedName( const plString & v )
{
fAgeInfo.SetAgeUserDefinedName( v );
}
@ -265,9 +265,9 @@ void pyAgeInfoStructRef::SetAgeSequenceNumber( int32_t v )
plString pyAgeInfoStructRef::GetDisplayName() const
{
const char* instance = GetAgeInstanceName();
const char* user = GetAgeUserDefinedName();
bool namesEqual = (stricmp(user, instance) == 0); // Ae'gura Ae'gura
plString instance = GetAgeInstanceName();
plString user = GetAgeUserDefinedName();
bool namesEqual = (user.CompareI(instance) == 0); // Ae'gura Ae'gura
if (namesEqual)
return instance;
@ -275,8 +275,8 @@ plString pyAgeInfoStructRef::GetDisplayName() const
{
int32_t seq = GetAgeSequenceNumber();
if (seq > 0)
return plString::Format("%s (%d) %s", user, seq, instance);
return plString::Format("%s (%d) %s", user.c_str(), seq, instance.c_str());
else
return plString::Format("%s %s", user, instance);
return plString::Format("%s %s", user.c_str(), instance.c_str());
}
}

28
Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h
View File

@ -87,14 +87,14 @@ public:
static void PythonModDef();
void CopyFrom( const pyAgeInfoStruct & other );
void CopyFromRef( const pyAgeInfoStructRef & other );
const char * GetAgeFilename() const;
void SetAgeFilename( const char * v );
const char * GetAgeInstanceName() const;
void SetAgeInstanceName( const char * v );
const char * GetAgeUserDefinedName() const;
void SetAgeUserDefinedName( const char * v );
const char * GetAgeDescription() const;
void SetAgeDescription( const char * v );
plString GetAgeFilename() const;
void SetAgeFilename( const plString & v );
plString GetAgeInstanceName() const;
void SetAgeInstanceName( const plString & v );
plString GetAgeUserDefinedName() const;
void SetAgeUserDefinedName( const plString & v );
plString GetAgeDescription() const;
void SetAgeDescription( const plString & v );
const char * GetAgeInstanceGuid() const;
void SetAgeInstanceGuid( const char * guid );
int32_t GetAgeSequenceNumber() const;
@ -132,12 +132,12 @@ public:
const plAgeInfoStruct * GetAgeInfo() const { return &fAgeInfo; }
void CopyFrom( const pyAgeInfoStruct & other );
void CopyFromRef( const pyAgeInfoStructRef & other );
const char * GetAgeFilename() const;
void SetAgeFilename( const char * v );
const char * GetAgeInstanceName() const;
void SetAgeInstanceName( const char * v );
const char * GetAgeUserDefinedName() const;
void SetAgeUserDefinedName( const char * v );
plString GetAgeFilename() const;
void SetAgeFilename( const plString & v );
plString GetAgeInstanceName() const;
void SetAgeInstanceName( const plString & v );
plString GetAgeUserDefinedName() const;
void SetAgeUserDefinedName( const plString & v );
const char * GetAgeInstanceGuid() const;
void SetAgeInstanceGuid( const char * guid );
int32_t GetAgeSequenceNumber() const;

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

@ -115,7 +115,7 @@ PYTHON_METHOD_DEFINITION(ptAgeInfoStruct, copyFrom, args)
PYTHON_METHOD_DEFINITION_NOARGS(ptAgeInfoStruct, getAgeFilename)
{
return PyString_FromString(self->fThis->GetAgeFilename());
return PyString_FromPlString(self->fThis->GetAgeFilename());
}
PYTHON_METHOD_DEFINITION(ptAgeInfoStruct, setAgeFilename, args)
@ -132,7 +132,7 @@ PYTHON_METHOD_DEFINITION(ptAgeInfoStruct, setAgeFilename, args)
PYTHON_METHOD_DEFINITION_NOARGS(ptAgeInfoStruct, getAgeInstanceName)
{
return PyString_FromString(self->fThis->GetAgeInstanceName());
return PyString_FromPlString(self->fThis->GetAgeInstanceName());
}
PYTHON_METHOD_DEFINITION(ptAgeInfoStruct, setAgeInstanceName, args)
@ -149,7 +149,7 @@ PYTHON_METHOD_DEFINITION(ptAgeInfoStruct, setAgeInstanceName, args)
PYTHON_METHOD_DEFINITION_NOARGS(ptAgeInfoStruct, getAgeUserDefinedName)
{
return PyString_FromString(self->fThis->GetAgeUserDefinedName());
return PyString_FromPlString(self->fThis->GetAgeUserDefinedName());
}
PYTHON_METHOD_DEFINITION(ptAgeInfoStruct, setAgeUserDefinedName, args)
@ -166,7 +166,7 @@ PYTHON_METHOD_DEFINITION(ptAgeInfoStruct, setAgeUserDefinedName, args)
PYTHON_METHOD_DEFINITION_NOARGS(ptAgeInfoStruct, getAgeDescription)
{
return PyString_FromString(self->fThis->GetAgeDescription());
return PyString_FromPlString(self->fThis->GetAgeDescription());
}
PYTHON_METHOD_DEFINITION(ptAgeInfoStruct, setAgeDescription, args)
@ -325,7 +325,7 @@ PYTHON_METHOD_DEFINITION(ptAgeInfoStructRef, copyFrom, args)
PYTHON_METHOD_DEFINITION_NOARGS(ptAgeInfoStructRef, getAgeFilename)
{
return PyString_FromString(self->fThis->GetAgeFilename());
return PyString_FromPlString(self->fThis->GetAgeFilename());
}
PYTHON_METHOD_DEFINITION(ptAgeInfoStructRef, setAgeFilename, args)
@ -342,7 +342,7 @@ PYTHON_METHOD_DEFINITION(ptAgeInfoStructRef, setAgeFilename, args)
PYTHON_METHOD_DEFINITION_NOARGS(ptAgeInfoStructRef, getAgeInstanceName)
{
return PyString_FromString(self->fThis->GetAgeInstanceName());
return PyString_FromPlString(self->fThis->GetAgeInstanceName());
}
PYTHON_METHOD_DEFINITION(ptAgeInfoStructRef, setAgeInstanceName, args)
@ -359,7 +359,7 @@ PYTHON_METHOD_DEFINITION(ptAgeInfoStructRef, setAgeInstanceName, args)
PYTHON_METHOD_DEFINITION_NOARGS(ptAgeInfoStructRef, getAgeUserDefinedName)
{
return PyString_FromString(self->fThis->GetAgeUserDefinedName());
return PyString_FromPlString(self->fThis->GetAgeUserDefinedName());
}
PYTHON_METHOD_DEFINITION(ptAgeInfoStructRef, setAgeUserDefinedName, args)

16
Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h
View File

@ -76,9 +76,9 @@ public:
plNetServerSessionInfo & ServerInfo() { return fInfo; }
void SetServerName(const char * val) { fInfo.SetServerName( val ); }
void SetServerName(const plString & val) { fInfo.SetServerName( val ); }
void SetServerType(uint8_t val) { fInfo.SetServerType( val ); }
void SetServerAddr(const char * val) { fInfo.SetServerAddr( val ); }
void SetServerAddr(const plString & val) { fInfo.SetServerAddr( val ); }
void SetServerPort(uint16_t val) { fInfo.SetServerPort( val ); }
void SetServerGuid(const char * val) { fServerGuid.FromString( val ); fInfo.SetServerGuid( &fServerGuid ); }
bool HasServerName() const { return fInfo.HasServerName(); }
@ -86,9 +86,9 @@ public:
bool HasServerAddr() const { return fInfo.HasServerAddr(); }
bool HasServerPort() const { return fInfo.HasServerPort(); }
bool HasServerGuid() const { return fInfo.HasServerGuid(); }
const char * GetServerName() const { return fInfo.GetServerName(); }
plString GetServerName() const { return fInfo.GetServerName(); }
uint8_t GetServerType() const { return fInfo.GetServerType(); }
const char * GetServerAddr() const { return fInfo.GetServerAddr(); }
plString GetServerAddr() const { return fInfo.GetServerAddr(); }
uint16_t GetServerPort() const { return fInfo.GetServerPort(); }
const char * GetServerGuid() const { fServerGuid.CopyFrom( fInfo.GetServerGuid() ); return fServerGuid.AsString().c_str(); }
};
@ -116,9 +116,9 @@ public:
static void AddPlasmaClasses(PyObject *m);
void SetServerName(const char * val) { fInfo.SetServerName( val ); }
void SetServerName(const plString & val) { fInfo.SetServerName( val ); }
void SetServerType(uint8_t val) { fInfo.SetServerType( val ); }
void SetServerAddr(const char * val) { fInfo.SetServerAddr( val ); }
void SetServerAddr(const plString & val) { fInfo.SetServerAddr( val ); }
void SetServerPort(uint16_t val) { fInfo.SetServerPort( val ); }
void SetServerGuid(const char * val) { fServerGuid.FromString( val ); fInfo.SetServerGuid( &fServerGuid ); }
bool HasServerName() const { return fInfo.HasServerName(); }
@ -126,9 +126,9 @@ public:
bool HasServerAddr() const { return fInfo.HasServerAddr(); }
bool HasServerPort() const { return fInfo.HasServerPort(); }
bool HasServerGuid() const { return fInfo.HasServerGuid(); }
const char * GetServerName() const { return fInfo.GetServerName(); }
plString GetServerName() const { return fInfo.GetServerName(); }
uint8_t GetServerType() const { return fInfo.GetServerType(); }
const char * GetServerAddr() const { return fInfo.GetServerAddr(); }
plString GetServerAddr() const { return fInfo.GetServerAddr(); }
uint16_t GetServerPort() const { return fInfo.GetServerPort(); }
const char * GetServerGuid() const { fServerGuid.CopyFrom( fInfo.GetServerGuid() ); return fServerGuid.AsString().c_str(); }
};

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

@ -143,7 +143,7 @@ PYTHON_METHOD_DEFINITION_NOARGS(ptNetServerSessionInfo, hasServerGuid)
PYTHON_METHOD_DEFINITION_NOARGS(ptNetServerSessionInfo, getServerName)
{
return PyString_FromString(self->fThis->GetServerName());
return PyString_FromPlString(self->fThis->GetServerName());
}
PYTHON_METHOD_DEFINITION_NOARGS(ptNetServerSessionInfo, getServerType)
@ -153,7 +153,7 @@ PYTHON_METHOD_DEFINITION_NOARGS(ptNetServerSessionInfo, getServerType)
PYTHON_METHOD_DEFINITION_NOARGS(ptNetServerSessionInfo, getServerAddr)
{
return PyString_FromString(self->fThis->GetServerAddr());
return PyString_FromPlString(self->fThis->GetServerAddr());
}
PYTHON_METHOD_DEFINITION_NOARGS(ptNetServerSessionInfo, getServerPort)
@ -306,7 +306,7 @@ PYTHON_METHOD_DEFINITION_NOARGS(ptNetServerSessionInfoRef, hasServerGuid)
PYTHON_METHOD_DEFINITION_NOARGS(ptNetServerSessionInfoRef, getServerName)
{
return PyString_FromString(self->fThis->GetServerName());
return PyString_FromPlString(self->fThis->GetServerName());
}
PYTHON_METHOD_DEFINITION_NOARGS(ptNetServerSessionInfoRef, getServerType)
@ -316,7 +316,7 @@ PYTHON_METHOD_DEFINITION_NOARGS(ptNetServerSessionInfoRef, getServerType)
PYTHON_METHOD_DEFINITION_NOARGS(ptNetServerSessionInfoRef, getServerAddr)
{
return PyString_FromString(self->fThis->GetServerAddr());
return PyString_FromPlString(self->fThis->GetServerAddr());
}
PYTHON_METHOD_DEFINITION_NOARGS(ptNetServerSessionInfoRef, getServerPort)

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

@ -671,18 +671,18 @@ void pyVault::CreateNeighborhood()
if (nc->GetPlayerName().CharAt(nameLen - 1) == 's' || nc->GetPlayerName().CharAt(nameLen - 1) == 'S')
{
title = plString::Format( "%s'", nc->GetPlayerName().c_str() );
desc = plString::Format( "%s' %s", nc->GetPlayerName().c_str(), link.GetAgeInfo()->GetAgeInstanceName() );
desc = plString::Format( "%s' %s", nc->GetPlayerName().c_str(), link.GetAgeInfo()->GetAgeInstanceName().c_str() );
}
else
{
title = plString::Format( "%s's", nc->GetPlayerName().c_str() );
desc = plString::Format( "%s's %s", nc->GetPlayerName().c_str(), link.GetAgeInfo()->GetAgeInstanceName() );
desc = plString::Format( "%s's %s", nc->GetPlayerName().c_str(), link.GetAgeInfo()->GetAgeInstanceName().c_str() );
}
plUUID guid = plUUID::Generate();
link.GetAgeInfo()->SetAgeInstanceGuid(&guid);
link.GetAgeInfo()->SetAgeUserDefinedName( title.c_str() );
link.GetAgeInfo()->SetAgeDescription( desc.c_str() );
link.GetAgeInfo()->SetAgeUserDefinedName(title);
link.GetAgeInfo()->SetAgeDescription(desc);
VaultRegisterOwnedAge(&link);
}