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

Merge pull request #415 from Hoikas/coverity

Browse Source 
Fix moar leeks
This commit is contained in:
Adam Johnson
2014-05-11 23:19:53 -04:00
parent eefa389be1 d4dbc81522
commit 3b8ad7eabf
2 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Sources/Plasma/FeatureLib/pfPython/cyCamera.cpp
View File

@ -176,25 +176,16 @@ void cyCamera::ControlKey(int32_t controlKey, bool activated)
// //
void cyCamera::TransitionTo(pyKey& newCamKey, double time, bool save) void cyCamera::TransitionTo(pyKey& newCamKey, double time, bool save)
{ {
// create message if (fTheCam) {
plCameraMsg* pMsg = new plCameraMsg; plCameraMsg* pMsg = new plCameraMsg;
if (fSender) if (fSender)
pMsg->SetSender(fSender); pMsg->SetSender(fSender);
// must have a receiver!
if ( fTheCam )
{
pMsg->AddReceiver(fTheCam);
// set command to do the transition
pMsg->SetCmd(plCameraMsg::kTransitionTo); pMsg->SetCmd(plCameraMsg::kTransitionTo);
// set the new camera
pMsg->SetNewCam(newCamKey.getKey()); pMsg->SetNewCam(newCamKey.getKey());
// set the transition time
pMsg->SetTransTime(time); pMsg->SetTransTime(time);
// test to see if they want to save
if (save) if (save)
pMsg->SetCmd(plCameraMsg::kPush); pMsg->SetCmd(plCameraMsg::kPush);
pMsg->Send(fTheCam);
plgDispatch::MsgSend( pMsg ); // whoosh... off it goes
} }
} }
@ -221,18 +212,12 @@ void cyCamera::SetEnableFirstPersonOverride(bool state) const
void cyCamera::UndoFirstPerson() void cyCamera::UndoFirstPerson()
{ {
// create message if (fTheCam) {
plCameraMsg* pMsg = new plCameraMsg; plCameraMsg* pMsg = new plCameraMsg;
if (fSender) if (fSender)
pMsg->SetSender(fSender); pMsg->SetSender(fSender);
// must have a receiver!
if ( fTheCam )
{
pMsg->AddReceiver(fTheCam);
// set command to do the transition
pMsg->SetCmd(plCameraMsg::kPythonUndoFirstPerson); pMsg->SetCmd(plCameraMsg::kPythonUndoFirstPerson);
pMsg->Send(fTheCam);
plgDispatch::MsgSend( pMsg ); // whoosh... off it goes
} }
} }

11
Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp
View File

@ -723,16 +723,15 @@ void plNetLinkingMgr::OfferLinkToPlayer( const plAgeLinkStruct * inInfo, uint32_
{ {
plNetClientMgr* mgr = plNetClientMgr::GetInstance(); plNetClientMgr* mgr = plNetClientMgr::GetInstance();
plNetTransport& transport = mgr->TransportMgr();
int guestIdx = transport.FindMember(playerID);
plNetTransportMember* guestMem = transport.GetMember(guestIdx); // -1 ?
if (guestMem) {
plLinkToAgeMsg* linkM = new plLinkToAgeMsg(inInfo); plLinkToAgeMsg* linkM = new plLinkToAgeMsg(inInfo);
linkM->AddReceiver(mgr->GetKey()); linkM->AddReceiver(mgr->GetKey());
plKey host = mgr->GetLocalPlayerKey(); plKey host = mgr->GetLocalPlayerKey();
plNetTransport &transport = mgr->TransportMgr();
int guestIdx = transport.FindMember(playerID);
plNetTransportMember *guestMem = transport.GetMember(guestIdx); // -1 ?
if(guestMem)
{
plKey guest = guestMem->GetAvatarKey(); plKey guest = guestMem->GetAvatarKey();
plAvatarMgr::OfferLinkingBook(host, guest, linkM, host); plAvatarMgr::OfferLinkingBook(host, guest, linkM, host);
} }