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

Add more temporary hack macros to help speed up conversion and testing

Browse Source
This commit is contained in:
Michael Hansen
2012-01-25 22:43:18 -08:00
parent a1852ad385
commit 442a733fbb
27 changed files with 130 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Sources/Plasma/PubUtilLib/plNetTransport/plNetTransport.cpp
View File

@ -61,7 +61,7 @@ int plNetTransport::AddMember(plNetTransportMember* mbr)
if (FindMember(mbr)==-1)
{
fMembers.push_back(mbr);
hsLogEntry( plNetClientMgr::GetInstance()->DebugMsg("Adding member %s", mbr->AsStdString().c_str()) );
hsLogEntry( plNetClientMgr::GetInstance()->DebugMsg("Adding member %s", mbr->AsString().c_str()) );
plNetClientMgr::GetInstance()->GetListenList()->AddMember(mbr);
plNetClientMgr::GetInstance()->GetTalkList()->AddMember(mbr);
DumpState();
@ -86,7 +86,7 @@ void plNetTransport::IRemoveMember(plNetTransportMember* mbr)
if (!mbr)
return;
hsLogEntry( plNetClientMgr::GetInstance()->DebugMsg("Removing member %s", mbr->AsStdString().c_str()) );
hsLogEntry( plNetClientMgr::GetInstance()->DebugMsg("Removing member %s", mbr->AsString().c_str()) );
// plNetClientMgr::GetInstance()->GetNetCore()->RemovePeer(mbr->GetPeerID());
plNetClientMgr::GetInstance()->GetTalkList()->RemoveMember(mbr);
@ -100,7 +100,7 @@ void plNetTransport::IRemoveMember(plNetTransportMember* mbr)
// remove member from master list
fMembers.erase(it);
hsLogEntry( plNetClientMgr::GetInstance()->DebugMsg("Done Removing member %s", mbr->AsStdString().c_str()) );
hsLogEntry( plNetClientMgr::GetInstance()->DebugMsg("Done Removing member %s", mbr->AsString().c_str()) );
DumpState();
delete mbr;
@ -319,7 +319,7 @@ void plNetTransport::DumpState()
for(j=0; j<mList->size();j++)
{
plNetTransportMember * mbr = (*mList)[j];
hsLogEntry( nc->DebugMsg("\t\tMbr %s\n",(*mList)[j]->AsStdString().c_str()) );
hsLogEntry( nc->DebugMsg("\t\tMbr %s\n",(*mList)[j]->AsString().c_str()) );
}
}
@ -328,7 +328,7 @@ void plNetTransport::DumpState()
{
plNetTransportMember * mbr = GetMember(i);
hsLogEntry (nc->DebugMsg("\tMbr %d, name=%s, plyrID=%lu, subs=%d",
i,mbr->AsStdString().c_str(),mbr->GetPlayerID(),mbr->GetNumSubscriptions()) );
i,mbr->AsString().c_str(),mbr->GetPlayerID(),mbr->GetNumSubscriptions()) );
int j;
for(j=0;j<mbr->GetNumSubscriptions();j++)
{

4
Sources/Plasma/PubUtilLib/plNetTransport/plNetTransportMember.cpp
View File

@ -73,11 +73,11 @@ int plNetTransportMember::FindSubscription(int chan)
return (it==fSubscriptions.end()) ? -1 : (it-fSubscriptions.begin());
}
std::string plNetTransportMember::AsStdString() const
plString plNetTransportMember::AsString() const
{
if (IsServer())
{
return "(server)";
return _TEMP_CONVERT_FROM_LITERAL("(server)");
}
else
{

11
Sources/Plasma/PubUtilLib/plNetTransport/plNetTransportMember.h
View File

@ -45,7 +45,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsConfig.h"
#include "hsStlUtils.h"
#include "plNetCommon/plNetMember.h"
#include "pnKeyedObject/plKey.h"
#include "pnKeyedObject/plKey.h"
#include "plString.h"
//
// This represents a participant in the game, ie. another
@ -64,7 +65,7 @@ public:
};
protected:
plKey fAvatarKey;
std::string fPlayerName;
plString fPlayerName;
UInt32 fPlayerID;
std::vector<int> fSubscriptions; // list of channelGrp subscriptions
UInt32 fTransportFlags;
@ -88,8 +89,8 @@ public:
{
fAvatarKey=k;
}
void SetPlayerName(const char * value) { fPlayerName=value;}
const char * GetPlayerName() const { return fPlayerName.c_str();}
void SetPlayerName(const plString & value) { fPlayerName=value;}
plString GetPlayerName() const { return fPlayerName;}
void SetPlayerID(UInt32 value) { fPlayerID=value;}
UInt32 GetPlayerID() const { return fPlayerID;}
void SetIsServer(bool value) { (value)?SetFlags(GetFlags()|kIsServer):SetFlags(GetFlags()&!kIsServer);}
@ -108,7 +109,7 @@ public:
UInt32 GetTransportFlags() const { return fTransportFlags; }
bool IsPeerToPeer() const { return hsCheckBits(fFlags, kRequestP2P); }
std::string AsStdString() const;
plString AsString() const;
bool IsEqualTo(const plNetMember * other) const
{
const plNetTransportMember * o = plNetTransportMember::ConvertNoRef(other);