Merge pull request dklollol#75 from dklollol/dev

Dev

core/functions.sqf

@@ -127,6 +127,24 @@ FNC_EventSpawned = {
 
 };
 
+FNC_EventRespawned = {
+
+	private ["_new"];
+
+	_new = _this select 0;
+
+	if (!(_new getVariable "FW_Dead")) then {	
+
+		_new call FNC_EventSpawned;
+
+	} else {
+
+		_new call FNC_UntrackUnit;
+
+	};
+
+};
+
 FNC_EventDisconnect = {
 
 	private ["_unit", "_side", "_type", "_total", "_current"];
@@ -154,33 +172,13 @@ FNC_EventDisconnect = {
 			};
 
 		} forEach FW_Teams;
-
-		deleteVehicle _unit;
 
 	};
 
 	false
 
 };
 
-FNC_EventRespawned = {
-
-	private ["_new"];
-
-	_new = _this select 0;
-
-	if (!(_new getVariable "FW_Dead")) then {	
-
-		_new call FNC_EventSpawned;
-
-	} else {
-
-		_new call FNC_UntrackUnit;
-
-	};
-
-};
-
 FNC_TrackUnit = {
 
 	private ["_unit"];

core/init.sqf

@@ -16,6 +16,8 @@ if (isServer) then {
 	FW_EventRespawnedHandle = addMissionEventHandler ["EntityRespawned", {_this call FNC_EventRespawned;}];
 	FW_EventKilledHandle = addMissionEventHandler ["EntityKilled", {_this call FNC_EventKilled;}];
 
+	FW_EventDisconnectHandle = addMissionEventHandler ["HandleDisconnect", {_this call FNC_EventDisconnect;}];
+
 };
 
 if (!isDedicated) then {
@@ -51,7 +53,7 @@ if (!isDedicated) then {
 
 	//Makes the player go into spectator mode when dead or respawn if he has respawn tickets
 	FW_KilledEh = player addEventHandler ["Killed", {"" spawn FNC_SpectateCheck;}];
-	FW_RespawnEh = player addEventHandler ["Respawn", {"" call FNC_SpectatePrep;}];
+	FW_RespawnEh = player addEventHandler ["Respawn", {_this call FNC_SpectatePrep;}];
 
 	//Various settings
 	player addRating 100000; //Makes sure ai doesnt turn hostile when teamkilling

core/menu.sqf

@@ -9,7 +9,7 @@ The Olsen Framework is a simple framework designed for ArmA 3. It supports modul
 Find out more about the framework on GitHub.<br/>
 github.com/dklollol/Olsen-Framework-Arma-3<br/>
 <br/>
-Current Version: 3.0.6
+Current Version: 3.1.0
 ";
 
 player createDiaryRecord ["FW_Menu", ["Framework Info", _info]];

core/preInitFunctions.sqf

@@ -1,6 +1,6 @@
 FW_DebugMessages = [];
 
-FNC_UntrackUnit = {
+FNC_NotTrackUnit = {
 
 	private ["_unit"];
 

description.ext

@@ -1,7 +1,6 @@
 #define description
 
 #include "core\description.hpp" //DO NOT REMOVE
-#include "customization\missionSettings.hpp" //DO NOT REMOVE
 #include "modules\modules.sqf" //DO NOT REMOVE
 
 #undef description
@@ -32,4 +31,4 @@ class Params {
 	#include "core\description.hpp" //DO NOT REMOVE
 	#include "modules\modules.sqf" //DO NOT REMOVE
 
-};
+};