From 3895a51f022a3a34280785112c7fd4fe0be24009 Mon Sep 17 00:00:00 2001
From: SilentSpike <silentspike100+Github@gmail.com>
Date: Thu, 16 Jul 2015 17:48:32 +0100
Subject: [PATCH] Correcting view transition

---
 addons/spectator/functions/fnc_handleInterface.sqf | 8 +++-----
 addons/spectator/functions/fnc_updateView.sqf      | 8 ++++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/addons/spectator/functions/fnc_handleInterface.sqf b/addons/spectator/functions/fnc_handleInterface.sqf
index be7f5f9bb1..9a59078f60 100644
--- a/addons/spectator/functions/fnc_handleInterface.sqf
+++ b/addons/spectator/functions/fnc_handleInterface.sqf
@@ -44,7 +44,7 @@ switch (toLower _mode) do {
         GVAR(camFocus) = [-1,-1];
         GVAR(camFOV) = 0.7;
         GVAR(camSpeed) = 0.1;
-        GVAR(camTilt) = -60;
+        GVAR(camTilt) = -10;
         GVAR(camZoom) = 3;
         GVAR(gunCam) = false;
 
@@ -60,10 +60,6 @@ switch (toLower _mode) do {
         GVAR(camera) setDir GVAR(camPan);
         call FUNC(updateView);
 
-        // HUD stuff
-        showCinemaBorder false;
-        cameraEffectEnableHUD true;
-
         // Handle camera movement
         [FUNC(handleCamera), 0] call CBA_fnc_addPerFrameHandler;
 
@@ -291,6 +287,8 @@ switch (toLower _mode) do {
                 _netID = (_args select 0) tvData _sel;
                 GVAR(camUnit) = objectFromNetId _netID;
             };
+        } else {
+            GVAR(camMode) == 1;
         };
         call FUNC(updateView);
     };
diff --git a/addons/spectator/functions/fnc_updateView.sqf b/addons/spectator/functions/fnc_updateView.sqf
index db30ee1cab..64f2544645 100644
--- a/addons/spectator/functions/fnc_updateView.sqf
+++ b/addons/spectator/functions/fnc_updateView.sqf
@@ -4,6 +4,10 @@ GVAR(camera) camSetFOV GVAR(camFOV);
 
 if (GVAR(camMode) == 0) then { // Free
     GVAR(camera) cameraEffect ["internal", "back"];
+
+    // HUD stuff
+    showCinemaBorder false;
+    cameraEffectEnableHUD false;
 } else {
     // When no units available to spectate, exit to freecam
     if (unitList isEqualTo []) exitWith {
@@ -26,5 +30,9 @@ if (GVAR(camMode) == 0) then { // Free
     } else { // External
         GVAR(camUnit) switchCamera "external";
     };
+
+    // Terminate camera view
+    GVAR(camera) cameraEffect ["terminate", "back"];
+    cameraEffectEnableHUD true;
 };