From bc6f756df45069fb91a24997fcc7bbf3a286167b Mon Sep 17 00:00:00 2001
From: commy2 <commy-2@gmx.de>
Date: Sun, 29 May 2016 13:22:49 +0200
Subject: [PATCH] fix rallypoint being objNull, when created via
 'createvehicle'

---
 .../respawn/functions/fnc_initRallypoint.sqf  | 47 +++++++++----------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/addons/respawn/functions/fnc_initRallypoint.sqf b/addons/respawn/functions/fnc_initRallypoint.sqf
index dba1ae5d0a..70475dedc2 100644
--- a/addons/respawn/functions/fnc_initRallypoint.sqf
+++ b/addons/respawn/functions/fnc_initRallypoint.sqf
@@ -19,49 +19,46 @@
 
 params ["_rallypoint", "_respawnMarker", "_side"];
 
-private "_name";
-_name = typeOf _rallypoint;
+private _name = typeOf _rallypoint;
+
+if (isNil _name) then {
+    missionNamespace setVariable [_name, _rallypoint];
+
+    _rallypoint setVariable [QGVAR(side), _side];
+
+    if (isServer) then {
+        if (_respawnMarker != "" && {!(_respawnMarker in allMapMarkers)}) then {
+            createMarker [_respawnMarker, _rallypoint];
+        };
+
+        ["rallypointMoved", [_rallypoint, _side]] call EFUNC(common,globalEvent);
+    };
+} else {
+    deleteVehicle _rallypoint;
+    ACE_LOGERROR("Multiple Rallypoints of same type.");
+};
 
 // init visible marker
 if (hasInterface) then {
     [{
         params ["_rallypoint", "_respawnMarker", "_side", "_name"];
 
-        private ["_marker", "_type", "_date"];
-
-       _marker = format ["ACE_Marker_%1", _name];
+        private _marker = format ["ACE_Marker_%1", _name];
 
         // exit if marker already exist
         if (_marker in allMapMarkers) exitWith {};
 
         _marker = createMarkerLocal [_marker, getPosASL _rallypoint];
-        _type = ["selector_selectedFriendly", "selector_selectedEnemy"] select (_respawnMarker == "");
+
+        private _type = ["selector_selectedFriendly", "selector_selectedEnemy"] select (_respawnMarker == "");
 
         _marker setMarkerTypeLocal _type;
         _marker setMarkerAlphaLocal ([0,1] select (_side == playerSide)); // playerSide to guarantee init
 
-        _date = _rallypoint getVariable [QGVAR(markerDate), ""];
+        private _date = _rallypoint getVariable [QGVAR(markerDate), ""];
 
         _marker setMarkerTextLocal _date;
 
         _rallypoint setVariable [QGVAR(marker), _marker];
     }, [_rallypoint, _respawnMarker, _side, _name], 0.1] call EFUNC(common,waitAndExecute);
 };
-
-if (!isServer) exitWith {};
-
-if (isNil _name) then {
-    missionNamespace setVariable [_name, _rallypoint];
-    publicVariable _name;
-
-    _rallypoint setVariable [QGVAR(side), _side, true];
-
-    if (_respawnMarker != "" && {!(_respawnMarker in allMapMarkers)}) then {
-        createMarker [_respawnMarker, _rallypoint];
-    };
-
-    ["rallypointMoved", [_rallypoint, _side]] call EFUNC(common,globalEvent);
-} else {
-    deleteVehicle _rallypoint;
-    ACE_LOGERROR("Multiple Rallypoints of same type.");
-};