mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-21 12:49:10 +00:00
Get rid of NEW(), TRACKED_NEW, and ZERO().
This commit is contained in:
@ -176,7 +176,7 @@ MSG_HANDLER_DEFN(plNetClientMsgHandler,plNetMsgGroupOwner)
|
||||
*/
|
||||
|
||||
/*
|
||||
plNetOwnershipMsg* netOwnMsg = TRACKED_NEW plNetOwnershipMsg;
|
||||
plNetOwnershipMsg* netOwnMsg = new plNetOwnershipMsg;
|
||||
|
||||
int i;
|
||||
for(i=0;i<m->GetNumGroups();i++)
|
||||
@ -247,7 +247,7 @@ MSG_HANDLER_DEFN(plNetClientMsgHandler,plNetMsgSDLState)
|
||||
//
|
||||
// ERROR CHECK SDL FILE
|
||||
//
|
||||
plStateDataRecord* sdRec = des ? TRACKED_NEW plStateDataRecord(des) : nil;
|
||||
plStateDataRecord* sdRec = des ? new plStateDataRecord(des) : nil;
|
||||
if (!sdRec || sdRec->GetDescriptor()->GetVersion()!=ver)
|
||||
{
|
||||
std::string err;
|
||||
@ -269,7 +269,7 @@ MSG_HANDLER_DEFN(plNetClientMsgHandler,plNetMsgSDLState)
|
||||
plStateDataRecord* stateRec = nil;
|
||||
if (m->IsInitialState())
|
||||
{
|
||||
stateRec = TRACKED_NEW plStateDataRecord(des);
|
||||
stateRec = new plStateDataRecord(des);
|
||||
stateRec->SetFromDefaults(false);
|
||||
stateRec->UpdateFrom(*sdRec, rwFlags);
|
||||
|
||||
@ -278,7 +278,7 @@ MSG_HANDLER_DEFN(plNetClientMsgHandler,plNetMsgSDLState)
|
||||
else
|
||||
stateRec = sdRec;
|
||||
|
||||
plNetClientMgr::PendingLoad* pl = TRACKED_NEW plNetClientMgr::PendingLoad();
|
||||
plNetClientMgr::PendingLoad* pl = new plNetClientMgr::PendingLoad();
|
||||
pl->fSDRec = stateRec; // will be deleted when PendingLoad is processed
|
||||
if (m->GetHasPlayerID())
|
||||
pl->fPlayerID = m->GetPlayerID(); // copy originating playerID if we have it
|
||||
@ -334,7 +334,7 @@ MSG_HANDLER_DEFN(plNetClientMsgHandler,plNetMsgGameMessage)
|
||||
plLoadAvatarMsg* unloadClone = plLoadAvatarMsg::ConvertNoRef(gameMsg);
|
||||
if (unloadClone)
|
||||
{
|
||||
plLoadAvatarMsg* unloadMsg = TRACKED_NEW plLoadAvatarMsg(unloadClone->GetCloneKey(), unloadClone->GetRequestorKey(), unloadClone->GetUserData(), unloadClone->GetIsPlayer(), false);
|
||||
plLoadAvatarMsg* unloadMsg = new plLoadAvatarMsg(unloadClone->GetCloneKey(), unloadClone->GetRequestorKey(), unloadClone->GetUserData(), unloadClone->GetIsPlayer(), false);
|
||||
unloadMsg->SetOriginatingPlayerID(unloadClone->GetOriginatingPlayerID());
|
||||
gameMsg = unloadMsg;
|
||||
}
|
||||
@ -485,7 +485,7 @@ MSG_HANDLER_DEFN(plNetClientMsgHandler,plNetMsgMembersList)
|
||||
// this app is not one of the members in the msg
|
||||
for( i=0 ;i<m->MemberListInfo()->GetNumMembers() ;i++ )
|
||||
{
|
||||
plNetTransportMember* mbr = TRACKED_NEW plNetTransportMember(nc);
|
||||
plNetTransportMember* mbr = new plNetTransportMember(nc);
|
||||
IFillInTransportMember(m->MemberListInfo()->GetMember(i), mbr);
|
||||
hsLogEntry(nc->DebugMsg("\tAdding transport member, name=%s, p2p=%d, plrID=%d\n", mbr->AsStdString().c_str(), mbr->IsPeerToPeer(), mbr->GetPlayerID()));
|
||||
int idx=nc->fTransport.AddMember(mbr);
|
||||
@ -494,7 +494,7 @@ MSG_HANDLER_DEFN(plNetClientMsgHandler,plNetMsgMembersList)
|
||||
} // for
|
||||
|
||||
// new player has been aded send local MembersUpdate msg
|
||||
plMemberUpdateMsg* mu = TRACKED_NEW plMemberUpdateMsg;
|
||||
plMemberUpdateMsg* mu = new plMemberUpdateMsg;
|
||||
mu->Send();
|
||||
|
||||
return hsOK;
|
||||
@ -518,7 +518,7 @@ MSG_HANDLER_DEFN(plNetClientMsgHandler,plNetMsgMemberUpdate)
|
||||
if ( idx>=0 )
|
||||
mbr = nc->fTransport.GetMember(idx);
|
||||
else
|
||||
mbr = TRACKED_NEW plNetTransportMember(nc);
|
||||
mbr = new plNetTransportMember(nc);
|
||||
hsAssert(mbr, "nil xport member");
|
||||
IFillInTransportMember(m->MemberInfo(), mbr);
|
||||
|
||||
@ -542,7 +542,7 @@ MSG_HANDLER_DEFN(plNetClientMsgHandler,plNetMsgMemberUpdate)
|
||||
}
|
||||
|
||||
// new player has been aded send local MembersUpdate msg
|
||||
plMemberUpdateMsg* mu = TRACKED_NEW plMemberUpdateMsg;
|
||||
plMemberUpdateMsg* mu = new plMemberUpdateMsg;
|
||||
mu->Send();
|
||||
|
||||
return hsOK;
|
||||
@ -564,7 +564,7 @@ MSG_HANDLER_DEFN(plNetClientMsgHandler,plNetMsgListenListUpdate)
|
||||
if(!tm)
|
||||
{
|
||||
#if 0
|
||||
tm = TRACKED_NEW plNetTransportMember(nc);
|
||||
tm = new plNetTransportMember(nc);
|
||||
tm->SetClientNum(m->GetSenderClientNum());
|
||||
int idx=nc->fTransport.AddMember(tm);
|
||||
hsAssert(idx>=0, "Failed adding member?");
|
||||
|
Reference in New Issue
Block a user