From a743da47fb28a912b98ece9e98c72ea91ecff60c Mon Sep 17 00:00:00 2001
From: Darryl Pogue <dvpdiner2@gmail.com>
Date: Sun, 30 Oct 2011 13:36:31 -0700
Subject: [PATCH] Some fixes from mingw.

---
 .../FeatureLib/pfAnimation/plLineFollowMod.cpp       |  3 ++-
 Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp | 12 +++++++-----
 .../Plasma/FeatureLib/pfCamera/plCameraModifier.cpp  |  5 +++--
 .../Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp   | 10 ++++++++--
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.cpp b/Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.cpp
index 28d02ca5..dd0c8f23 100644
--- a/Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.cpp
+++ b/Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.cpp
@@ -572,7 +572,8 @@ void plLineFollowMod::ISetTargetTransform(int iTarg, const hsMatrix44& unclTgtXf
             xlate.Reset();
             xlate.SetTranslate(&oldPos);
             w2l = w2l * xlate;
-            xlate.SetTranslate(&-pos);
+            hsPoint3 neg = -pos;
+            xlate.SetTranslate(&neg);
             w2l = w2l * xlate;
 
             ci->SetTransform(l2w, w2l);
diff --git a/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp b/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp
index 9699d9d6..50cf05f4 100644
--- a/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp
+++ b/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp
@@ -132,7 +132,8 @@ fOffsetPct(1.0f)
     fPOAGoal.Set(0,0,0);
     fGoal.Set(1,1,1);
     fPOAOffset.Set(0,0,0);
-    fTargetMatrix.Make(&fGoal, &fPOAGoal, &hsVector3(0,0,1));
+    hsVector3 up(0, 0, 1);
+    fTargetMatrix.Make(&fGoal, &fPOAGoal, &up);
     fFlags.Clear();
 }
 
@@ -758,8 +759,8 @@ void plCameraBrain1_Drive::Pop()
 //
 void plCameraBrain1_Drive::Update(hsBool forced)
 {
-    
-    fTargetMatrix.Make(&fGoal, &fPOAGoal, &(-1*fUp));
+    hsVector3 neg_up = -1 * fUp; 
+    fTargetMatrix.Make(&fGoal, &fPOAGoal, &neg_up);
     
     // update our desired position:
     double time = hsTimer::GetSeconds();
@@ -1628,14 +1629,15 @@ void plCameraBrain1_Circle::Update(hsBool forced)
     
     fPOAGoal += fPOAOffset;
     
+    hsPoint3 goalpos = fCamera->GetTargetPos();
     if (HasFlag(kCutPosOnce))
     {
-        fGoal = MoveTowardsFromGoal(&fCamera->GetTargetPos(), secs, true);
+        fGoal = MoveTowardsFromGoal(&goalpos, secs, true);
         fFlags.ClearBit(kCutPos);
     }
     else
     {   
-        fGoal = MoveTowardsFromGoal(&fCamera->GetTargetPos(), secs);
+        fGoal = MoveTowardsFromGoal(&goalpos, secs);
         fFlags.SetBit(kCutPos);
     }
     AdjustForInput(secs);
diff --git a/Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.cpp b/Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.cpp
index 8084c0d5..62563795 100644
--- a/Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.cpp
+++ b/Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.cpp
@@ -274,7 +274,8 @@ void plCameraModifier1::Update()
             // have to ask the avatar controller for the subworld key.
             if (!worldKey)
             {
-                plArmatureMod* armMod = plAvatarMgr::FindAvatar(plKey(GetBrain()->GetSubject()->GetKey()));
+                plKey subject = plKey(GetBrain()->GetSubject()->GetKey());
+                plArmatureMod* armMod = plAvatarMgr::FindAvatar(subject);
                 if (armMod && armMod->GetController() )
                     worldKey = armMod->GetController()->GetSubworld();
             }
@@ -491,4 +492,4 @@ void plCameraModifier1::SetTransform(hsPoint3 at)
     l2w.Make(&fFrom, &at, &up);
     l2w.GetInverse(&w2l);
     IGetTargetCoordinateInterface(0)->SetTransform( l2w, w2l );
-}
\ No newline at end of file
+}
diff --git a/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp b/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp
index f67a698a..4028d296 100644
--- a/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp
+++ b/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp
@@ -1980,9 +1980,15 @@ void plVirtualCam1::StartTransition(CamTrans* transition)
         hsVector3 dist;
         // figure out transition time
         if (transition->fCutPos)
-            dist.Set(&(fTransitionCamera->GetTargetPOA() - pCam->GetTargetPOA()));
+        {
+            hsPoint3 poadist = fTransitionCamera->GetTargetPOA() - pCam->GetTargetPOA();
+            dist.Set(&poadist);
+        }
         else
-            dist.Set(&(fTransitionCamera->GetTargetPos() - pCam->GetTargetPos()));
+        {
+            hsPoint3 posdist = fTransitionCamera->GetTargetPos() - pCam->GetTargetPos();
+            dist.Set(&posdist);
+        }
         
         time = (double)(dist.Magnitude() / pBrain->GetVelocity());