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

Merge pull request #318 from Hoikas/ccr-bcast

Browse Source 
Global Chat Messages
This commit is contained in:
Adam Johnson
2013-04-12 16:59:55 -07:00
parent a8b667ca1e 3d6fb7e827
commit 99019becb0
8 changed files with 94 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp
View File

@ -359,12 +359,9 @@ int plNetClientMgr::ISendGameMessage(plMessage* msg)
//
bool ccrSendToAllPlayers = false;
#ifndef PLASMA_EXTERNAL_RELEASE
if ( AmCCR() )
{
ccrSendToAllPlayers = msg->HasBCastFlag( plMessage::kCCRSendToAllPlayers );
if ( ccrSendToAllPlayers )
netMsgWrap->SetBit( plNetMessage::kRouteToAllPlayers );
}
ccrSendToAllPlayers = msg->HasBCastFlag( plMessage::kCCRSendToAllPlayers );
if ( ccrSendToAllPlayers )
netMsgWrap->SetBit( plNetMessage::kRouteToAllPlayers );
#endif
//
@ -382,13 +379,13 @@ int plNetClientMgr::ISendGameMessage(plMessage* msg)
if (msg->HasBCastFlag(plMessage::kNetSendUnreliable) &&
!(synchedObj && (synchedObj->GetSynchFlags() & plSynchedObject::kSendReliably)) )
netMsgWrap->SetBit(plNetMessage::kNeedsReliableSend, 0); // clear reliable net send bit
#ifdef HS_DEBUGGING
int16_t type=*(int16_t*)netMsgWrap->StreamInfo()->GetStreamBuf();
hsAssert(type>=0 && type<plCreatableIndex::plNumClassIndices, "garbage type out");
#endif
netMsgWrap->SetPlayerID(GetPlayerID());
netMsgWrap->SetPlayerID(GetPlayerID());
netMsgWrap->SetNetProtocol(kNetProtocolCli2Game);
int ret = SendMsg(netMsgWrap);
@ -403,7 +400,7 @@ int plNetClientMgr::ISendGameMessage(plMessage* msg)
#endif
}
delete netMsgWrap;
delete netMsgWrap;
return ret;
}