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

Obliterate hsBool

Browse Source
This commit is contained in:
Adam Johnson
2012-07-11 01:28:00 -04:00
parent 5f78b33db4
commit a709e17069
1041 changed files with 7889 additions and 8070 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,7 @@ void plNetTransport::IUnSubscribeToAllChannelGrps(plNetTransportMember* mbr)
for( i=mbr->GetNumSubscriptions()-1; i>=0 ; i-- )
{
int chan=mbr->GetSubscription(i);
hsBool ok=UnSubscribeToChannelGrp(mbr, chan);
bool ok=UnSubscribeToChannelGrp(mbr, chan);
hsAssert(ok, "can't find supposed subscription to remove");
} // for
}
@ -111,7 +111,7 @@ void plNetTransport::IRemoveMember(plNetTransportMember* mbr)
// remove member from master list, and all subscription channels.
// return true on success.
//
hsBool plNetTransport::RemoveMember(int idx)
bool plNetTransport::RemoveMember(int idx)
{
if (idx>=0)
{
@ -126,7 +126,7 @@ hsBool plNetTransport::RemoveMember(int idx)
// remove member from master list, and all subscription channels.
// return true on success.
//
hsBool plNetTransport::RemoveMember(plNetTransportMember* mbr)
bool plNetTransport::RemoveMember(plNetTransportMember* mbr)
{
IRemoveMember(mbr);
return true;
@ -158,7 +158,7 @@ void plNetTransport::SubscribeToChannelGrp(plNetTransportMember* mbr, int channe
//
// Remove the subscription to the given channel grp for a member.
//
hsBool plNetTransport::UnSubscribeToChannelGrp(plNetTransportMember* mbr, int chan)
bool plNetTransport::UnSubscribeToChannelGrp(plNetTransportMember* mbr, int chan)
{
hsAssert(chan>=0 && chan<fChannelGroups.size(), "invalid channel idx");
plMembersList* mList = &fChannelGroups[chan];
@ -166,7 +166,7 @@ hsBool plNetTransport::UnSubscribeToChannelGrp(plNetTransportMember* mbr, int ch
if (it != mList->end())
{
mList->erase(it);
hsBool ret=mbr->RemoveSubscription(chan);
bool ret=mbr->RemoveSubscription(chan);
hsAssert(ret, "error removing subscription");
return true;
}
@ -219,7 +219,7 @@ int plNetTransport::SendMsg(int chan, plNetMessage* netMsg) const
NetCommSendMsg(netMsg);
if (rl)
{
hsBool ok=rl->RemoveReceiverPlayerID(tm->GetPlayerID());
bool ok=rl->RemoveReceiverPlayerID(tm->GetPlayerID());
hsAssert(ok, "couldn't find rcvr to remove?");
}
ret=0; // sent ok
@ -297,7 +297,7 @@ void plNetTransport::ClearChannelGrp(int channel)
for( i=0 ; i<size; i++ )
{
plNetTransportMember* tm=(*mList)[i];
hsBool ok=tm->RemoveSubscription(channel);
bool ok=tm->RemoveSubscription(channel);
hsAssert(ok, "error removing subscription");
}

6
Sources/Plasma/PubUtilLib/plNetTransport/plNetTransport.h
View File

@ -76,15 +76,15 @@ public:
int FindMember(uint32_t playerID) const; // return array index or -1
int FindMember(const plNetTransportMember* mbr); // return array index or -1
int AddMember(plNetTransportMember* mbr); // to master list, if not there
hsBool RemoveMember(plNetTransportMember* mbr); // from master list and all channels
hsBool RemoveMember(int idx); // from master list and all channels
bool RemoveMember(plNetTransportMember* mbr); // from master list and all channels
bool RemoveMember(int idx); // from master list and all channels
int GetNumMembers() const { return fMembers.size(); }
plNetTransportMember* GetMember(int i) const { return i>=0 && i<fMembers.size() ? fMembers[i] : nil; }
void ClearMembers();
// channel group ops
void SubscribeToChannelGrp(plNetTransportMember* mbr, int channel);
hsBool UnSubscribeToChannelGrp(plNetTransportMember* mbr, int channel);
bool UnSubscribeToChannelGrp(plNetTransportMember* mbr, int channel);
void GetSubscriptions(plNetTransportMember* mbr, std::vector<int>* channels) const;
void ClearChannelGrp(int channel);
void SetNumChannels(int n);

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

@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// add a channel subscription if it's not already there
// returns true if added
//
hsBool plNetTransportMember::AddSubscription(int chan)
bool plNetTransportMember::AddSubscription(int chan)
{
if (FindSubscription(chan)==-1)
{
@ -56,7 +56,7 @@ hsBool plNetTransportMember::AddSubscription(int chan)
return false;
}
hsBool plNetTransportMember::RemoveSubscription(int chan)
bool plNetTransportMember::RemoveSubscription(int chan)
{
int idx=FindSubscription(chan);
if (idx>=0)

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

@ -96,8 +96,8 @@ public:
void SetIsServer(bool value) { (value)?SetFlags(GetFlags()|kIsServer):SetFlags(GetFlags()&!kIsServer);}
bool IsServer() const { return (GetFlags()&kIsServer)?true:false;}
hsBool AddSubscription(int chan);
hsBool RemoveSubscription(int chan); // return true on success
bool AddSubscription(int chan);
bool RemoveSubscription(int chan); // return true on success
int FindSubscription(int chan); // return index into subscription array or -1
int GetNumSubscriptions() { return fSubscriptions.size(); }