Merge branch 'pre4-testing' into 4zk-content-source

Author: fourZK

Activities/ActorEditor.h

@@ -42,9 +42,7 @@ class GUIComboBox;
 // Parent(s):       EditorActivity.
 // Class history:   10/08/2007 ActorEditor Created.
 
-class ActorEditor:
-    public EditorActivity
-{
+class ActorEditor : public EditorActivity {
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Public member variable, method and friend function declarations

Activities/AreaEditor.h

@@ -40,9 +40,7 @@ class GUIComboBox;
 // Parent(s):       EditorActivity.
 // Class history:   7/21/2008 AreaEditor created, based off SceneEditor
 
-class AreaEditor:
-    public EditorActivity
-{
+class AreaEditor : public EditorActivity {
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Public member variable, method and friend function declarations

Activities/AssemblyEditor.h

@@ -42,9 +42,7 @@ class GUIComboBox;
 // Class history:   8/30/2007 AssemblyEditor created, inheriting directly from Activity.
 //                  9/17/2007 Spliced out and made to derive from EditorActivty
 
-class AssemblyEditor:
-    public EditorActivity
-{
+class AssemblyEditor : public EditorActivity {
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Public member variable, method and friend function declarations

Activities/BaseEditor.h

@@ -41,9 +41,7 @@ class GUIComboBox;
 // Parent(s):       Activity.
 // Class history:   04/30/2010 Created BaseEditor for the campaign base blueprint editing.
 
-class BaseEditor:
-    public Activity
-{
+class BaseEditor : public Activity {
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Public member variable, method and friend function declarations

Activities/EditorActivity.h

@@ -42,9 +42,7 @@ class GUIComboBox;
 // Parent(s):       Activity.
 // Class history:   9/17/2007 EditorActivity created.
 
-class EditorActivity:
-    public Activity
-{
+class EditorActivity : public Activity {
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Public member variable, method and friend function declarations

Activities/GAScripted.h

@@ -31,9 +31,7 @@ class Actor;
 // Parent(s):       GameActivity.
 // Class history:   07/03/2008 GAScripted created.
 
-class GAScripted:
-    public GameActivity
-{
+class GAScripted : public GameActivity {
 
     friend class LuaMan;
     friend class ActivityMan;

Activities/GATutorial.h

@@ -30,9 +30,7 @@ class Actor;
 // Parent(s):       GameActivity.
 // Class history:   10/13/2007 GATutorial created.
 
-class GATutorial:
-    public GameActivity
-{
+class GATutorial : public GameActivity {
 
 
 //////////////////////////////////////////////////////////////////////////////////////////

Activities/GameActivity.cpp

@@ -1459,7 +1459,7 @@ void GameActivity::Update()
             m_PlayerController[player].RelativeCursorMovement(m_ActorCursor[player]);
 
             // Find the actor closest to the cursor, if any within the radius
-            float markedDistance = -1;
+			Vector markedDistance;
             Actor *pMarkedActor = g_MovableMan.GetClosestTeamActor(team, player, m_ActorCursor[player], g_SceneMan.GetSceneWidth(), markedDistance);
 //            Actor *pMarkedActor = g_MovableMan.GetClosestTeamActor(team, player, m_ActorCursor[player], g_FrameMan.GetPlayerScreenWidth() / 4);
 
@@ -1509,7 +1509,7 @@ void GameActivity::Update()
                     // Show the pie menu switching animation over the highlighted Actor
                     m_pPieMenu[player]->SetPos(pMarkedActor->GetPos());
 
-                    if (markedDistance > g_FrameMan.GetPlayerFrameBufferWidth(player) / 4)
+                    if (markedDistance.GetMagnitude() > g_FrameMan.GetPlayerFrameBufferWidth(player) / 4)
                         m_pPieMenu[player]->Wobble();
                     else
                         m_pPieMenu[player]->FreezeAtRadius(30);

Activities/GameActivity.h

@@ -43,9 +43,7 @@ class Loadout;
 // Parent(s):       Activity.
 // Class history:   8/7/2007 GameActivity created.
 
-class GameActivity:
-    public Activity
-{
+class GameActivity : public Activity {
 
     friend struct ActivityLuaBindings;
 

Activities/GibEditor.h

@@ -41,9 +41,7 @@ class GUIComboBox;
 // Parent(s):       EditorActivity.
 // Class history:   9/17/2007 GibEditor Created.
 
-class GibEditor:
-    public EditorActivity
-{
+class GibEditor : public EditorActivity {
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Public member variable, method and friend function declarations