mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-20 04:09:16 +00:00
Get rid of NEW(), TRACKED_NEW, and ZERO().
This commit is contained in:
@ -160,14 +160,14 @@ hsBool plSittingModifier::MsgReceive(plMessage *msg)
|
||||
plAvBrainHuman *brain = (avMod ? plAvBrainHuman::ConvertNoRef(avMod->GetCurrentBrain()) : nil);
|
||||
if (brain && !brain->IsRunningTask())
|
||||
{
|
||||
plNotifyMsg *notifyEnter = TRACKED_NEW plNotifyMsg(); // a message to send back when the brain starts
|
||||
plNotifyMsg *notifyEnter = new plNotifyMsg(); // a message to send back when the brain starts
|
||||
notifyEnter->fState = 1.0f; // it's an "on" event
|
||||
ISetupNotify(notifyEnter, notifyMsg); // copy events and address to sender
|
||||
|
||||
plNotifyMsg *notifyExit = nil;
|
||||
if (avatarKey == plNetClientApp::GetInstance()->GetLocalPlayerKey())
|
||||
{
|
||||
notifyExit = TRACKED_NEW plNotifyMsg(); // a new message to send back when the brain's done
|
||||
notifyExit = new plNotifyMsg(); // a new message to send back when the brain's done
|
||||
notifyExit->fState = 0.0f; // it's an "off" event
|
||||
ISetupNotify(notifyExit, notifyMsg); // copy events and address to sender
|
||||
notifyExit->AddReceiver(GetKey()); // have this message come back to us as well
|
||||
@ -226,27 +226,27 @@ void plSittingModifier::Trigger(const plArmatureMod *avMod, plNotifyMsg *enterNo
|
||||
plAvBrainGeneric *brain = IBuildSitBrain(avModKey, seekKey, &animName, enterNotify, exitNotify);
|
||||
if(brain)
|
||||
{
|
||||
plAvSeekMsg *seekMsg = TRACKED_NEW plAvSeekMsg(ourKey, avModKey, seekKey, 0.0f, true, kAlignHandleAnimEnd, animName);
|
||||
plAvSeekMsg *seekMsg = new plAvSeekMsg(ourKey, avModKey, seekKey, 0.0f, true, kAlignHandleAnimEnd, animName);
|
||||
seekMsg->Send();
|
||||
plAvTaskBrain *brainTask = TRACKED_NEW plAvTaskBrain(brain);
|
||||
plAvTaskMsg *brainMsg = TRACKED_NEW plAvTaskMsg(ourKey, avModKey, brainTask);
|
||||
plAvTaskBrain *brainTask = new plAvTaskBrain(brain);
|
||||
plAvTaskMsg *brainMsg = new plAvTaskMsg(ourKey, avModKey, brainTask);
|
||||
|
||||
brainMsg->Send();
|
||||
|
||||
if (avModKey == plAvatarMgr::GetInstance()->GetLocalAvatarKey())
|
||||
{
|
||||
plCameraMsg* pCam = TRACKED_NEW plCameraMsg;
|
||||
plCameraMsg* pCam = new plCameraMsg;
|
||||
pCam->SetBCastFlag(plMessage::kBCastByExactType);
|
||||
pCam->SetCmd(plCameraMsg::kResetPanning);
|
||||
pCam->Send();
|
||||
|
||||
plCameraMsg* pCam2 = TRACKED_NEW plCameraMsg;
|
||||
plCameraMsg* pCam2 = new plCameraMsg;
|
||||
pCam2->SetBCastFlag(plMessage::kBCastByExactType);
|
||||
pCam2->SetCmd(plCameraMsg::kPythonSetFirstPersonOverrideEnable);
|
||||
pCam2->SetActivated(false);
|
||||
pCam2->Send();
|
||||
|
||||
plCameraMsg* pCam3 = TRACKED_NEW plCameraMsg;
|
||||
plCameraMsg* pCam3 = new plCameraMsg;
|
||||
pCam3->SetBCastFlag(plMessage::kBCastByExactType);
|
||||
pCam3->SetCmd(plCameraMsg::kPythonUndoFirstPerson);
|
||||
pCam3->Send();
|
||||
@ -342,14 +342,14 @@ plAvBrainGeneric *plSittingModifier::IBuildSitBrain(plKey avModKey, plKey seekKe
|
||||
if(sitAnimName)
|
||||
{
|
||||
uint32_t exitFlags = plAvBrainGeneric::kExitNormal; // SOME stages can be interrupted, but not the brain itself
|
||||
brain = TRACKED_NEW plAvBrainGeneric(nil, enterNotify, exitNotify, nil, exitFlags, plAvBrainGeneric::kDefaultFadeIn,
|
||||
brain = new plAvBrainGeneric(nil, enterNotify, exitNotify, nil, exitFlags, plAvBrainGeneric::kDefaultFadeIn,
|
||||
plAvBrainGeneric::kDefaultFadeOut, plAvBrainGeneric::kMoveRelative);
|
||||
|
||||
plAnimStage *sitStage = TRACKED_NEW plAnimStage(sitAnimName, 0, plAnimStage::kForwardAuto, plAnimStage::kBackNone,
|
||||
plAnimStage *sitStage = new plAnimStage(sitAnimName, 0, plAnimStage::kForwardAuto, plAnimStage::kBackNone,
|
||||
plAnimStage::kAdvanceAuto, plAnimStage::kRegressNone, 0);
|
||||
plAnimStage *idleStage = TRACKED_NEW plAnimStage("SitIdle", plAnimStage::kNotifyEnter, plAnimStage::kForwardAuto, plAnimStage::kBackNone,
|
||||
plAnimStage *idleStage = new plAnimStage("SitIdle", plAnimStage::kNotifyEnter, plAnimStage::kForwardAuto, plAnimStage::kBackNone,
|
||||
plAnimStage::kAdvanceOnMove, plAnimStage::kRegressNone, -1);
|
||||
plAnimStage *standStage = TRACKED_NEW plAnimStage(standAnimName, 0, plAnimStage::kForwardAuto, plAnimStage::kBackNone,
|
||||
plAnimStage *standStage = new plAnimStage(standAnimName, 0, plAnimStage::kForwardAuto, plAnimStage::kBackNone,
|
||||
plAnimStage::kAdvanceAuto, plAnimStage::kRegressNone, 0);
|
||||
|
||||
brain->AddStage(sitStage);
|
||||
@ -370,12 +370,12 @@ void plSittingModifier::UnTrigger()
|
||||
{
|
||||
if (fTriggeredAvatarKey == plAvatarMgr::GetInstance()->GetLocalAvatarKey())
|
||||
{
|
||||
plCameraMsg* pCam = TRACKED_NEW plCameraMsg;
|
||||
plCameraMsg* pCam = new plCameraMsg;
|
||||
pCam->SetBCastFlag(plMessage::kBCastByExactType);
|
||||
pCam->SetCmd(plCameraMsg::kResetPanning);
|
||||
pCam->Send();
|
||||
|
||||
plCameraMsg* pCam2 = TRACKED_NEW plCameraMsg;
|
||||
plCameraMsg* pCam2 = new plCameraMsg;
|
||||
pCam2->SetBCastFlag(plMessage::kBCastByExactType);
|
||||
pCam2->SetCmd(plCameraMsg::kPythonSetFirstPersonOverrideEnable);
|
||||
pCam2->SetActivated(true);
|
||||
|
Reference in New Issue
Block a user