Merge pull request #415 from Hoikas/coverity

Fix moar leeks

Sources/Plasma/FeatureLib/pfPython/cyCamera.cpp

@@ -176,25 +176,16 @@ void cyCamera::ControlKey(int32_t controlKey, bool activated)
 //
 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);
-        // set the new camera
         pMsg->SetNewCam(newCamKey.getKey());
-        // set the transition time
         pMsg->SetTransTime(time);
-        // test to see if they want to save
+        if (save)
-        if ( save )
             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()
 {
-    // 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->Send(fTheCam);
-        plgDispatch::MsgSend( pMsg );   // whoosh... off it goes
     }
 }
 

Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp

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