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

Convert plUoid's object name to a plString

Browse Source
This commit is contained in:
Michael Hansen
2012-01-28 16:24:20 -08:00
parent 442a733fbb
commit e34414889f
122 changed files with 810 additions and 842 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.cpp
View File

@ -828,13 +828,6 @@ void plNetMsgSDLStateBCast::WriteVersion(hsStream* s, hsResMgr* mgr)
////////////////////////////////////////////////////////
// plNetMsgRoomsList
////////////////////////////////////////////////////////
plNetMsgRoomsList::~plNetMsgRoomsList()
{
int i;
for(i=0;i<GetNumRooms();i++)
delete [] fRoomNames[i];
}
int plNetMsgRoomsList::IPokeBuffer(hsStream* stream, UInt32 peekOptions)
{
int bytes=plNetMessage::IPokeBuffer(stream, peekOptions);
@ -871,7 +864,6 @@ int plNetMsgRoomsList::IPeekBuffer(hsStream* stream, UInt32 peekOptions)
loc.Read(stream);
fRooms[i]=loc;
// read room name for debugging
delete [] fRoomNames[i];
stream->LogSubStreamPushDesc("RoomList");
plMsgCStringHelper::Peek(fRoomNames[i],stream,peekOptions);
}
@ -884,13 +876,13 @@ int plNetMsgRoomsList::IPeekBuffer(hsStream* stream, UInt32 peekOptions)
void plNetMsgRoomsList::AddRoom(plKey rmKey)
{
fRooms.push_back(rmKey->GetUoid().GetLocation());
fRoomNames.push_back(hsStrcpy(rmKey->GetName()));
fRoomNames.push_back(rmKey->GetName());
}
void plNetMsgRoomsList::AddRoomLocation(plLocation loc, const char* rmName)
void plNetMsgRoomsList::AddRoomLocation(plLocation loc, const plString& rmName)
{
fRooms.push_back(loc);
fRoomNames.push_back(rmName ? hsStrcpy(rmName) : nil);
fRoomNames.push_back(rmName);
}
int plNetMsgRoomsList::FindRoomLocation(plLocation loc)

8
Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.h
View File

@ -451,24 +451,24 @@ class plNetMsgRoomsList : public plNetMessage
{
protected:
std::vector<plLocation> fRooms;
std::vector<char*> fRoomNames; // for debug usage only
std::vector<plString> fRoomNames; // for debug usage only
int IPokeBuffer(hsStream* stream, UInt32 peekOptions=0);
int IPeekBuffer(hsStream* stream, UInt32 peekOptions=0);
public:
plNetMsgRoomsList() {}
~plNetMsgRoomsList();
~plNetMsgRoomsList() {};
CLASSNAME_REGISTER( plNetMsgRoomsList );
GETINTERFACE_ANY( plNetMsgRoomsList, plNetMessage );
void AddRoom(plKey rmKey);
void AddRoomLocation(plLocation loc, const char* rmName);
void AddRoomLocation(plLocation loc, const plString& rmName);
int FindRoomLocation(plLocation loc);
int GetNumRooms() const { return fRooms.size(); }
plLocation GetRoomLoc(int i) const { return fRooms[i]; }
const char* GetRoomName(int i) const { return fRoomNames[i]; } // debug
plString GetRoomName(int i) const { return fRoomNames[i]; } // debug
};
//

2
Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.cpp
View File

@ -364,7 +364,7 @@ int plNetMsgObjectHelper::Peek(hsStream* stream, const UInt32 peekOptions)
hsBool plNetMsgObjectHelper::SetFromKey(const plKey &key)
{
if (!key || !key->GetName())
if (!key || key->GetName().IsNull())
return false;
fUoid = key->GetUoid();

2
Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.h
View File

@ -213,7 +213,7 @@ public:
void SetUoid(const plUoid &u) { fUoid=u; }
// getters
const char* GetObjectName() const { return fUoid.GetObjectName(); }
const plString& GetObjectName() const { return fUoid.GetObjectName(); }
UInt32 GetPageID() const { return fUoid.GetLocation().GetSequenceNumber(); }
const plUoid& GetUoid() const { return fUoid; }