fix start position

gruppe-adler · May 2, 2017 · 2674347 · 2674347
1 parent 34ce43d
commit 2674347
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 20 deletions.
diff --git a/functions/init/fn_initMission.sqf b/functions/init/fn_initMission.sqf
@@ -17,6 +17,9 @@ wita_missionParam_RESPAWNTIME = "RESPAWNTIME" call BIS_fnc_getParamValue;
         _bluforPos = [_indepPos] call wita_setup_fnc_blufor;
         [] call wita_setup_fnc_createCustomLocations;
 
+        missionNamespace setVariable ["WITA_INDEPPOS",_indepPos,true];
+        missionNamespace setVariable ["WITA_BLUFORPOS",_bluforPos,true];
+
         _carsHandle = [] spawn wita_civs_fnc_cars;
         _heliHandle = [] spawn wita_civs_fnc_helicopters;
         _boatHandle = [] spawn wita_civs_fnc_boats;
@@ -29,7 +32,10 @@ wita_missionParam_RESPAWNTIME = "RESPAWNTIME" call BIS_fnc_getParamValue;
 
     if (hasInterface) then {
         [{missionNamespace getVariable ["WITA_GAMESTARTED",false] && !isNull player}, {[] call wita_setup_fnc_addKilledEH}, []] call CBA_fnc_waitUntilAndExecute;
-        if (didJIP && {[] call wita_common_fnc_isAgent} && {[] call wita_common_fnc_isAgent}) then {
+        if (didJIP && {missionNamespace getVariable ["WITA_GAMESTARTED",false]}) then {
+            if (playerSide == INDEPENDENT) then {[player,WITA_INDEPPOS] call wita_common_fnc_teleport} else {[player,WITA_BLUFORPOS] call wita_common_fnc_teleport};
+        };
+        if (didJIP && {[] call wita_common_fnc_isAgent}) then {
             [player] remoteExec ["wita_mission_fnc_agentMarker",2,false];
         };
     };

diff --git a/node_modules/grad-scoreboard/functions/fn_loadScoreboard.sqf b/node_modules/grad-scoreboard/functions/fn_loadScoreboard.sqf
diff --git a/node_modules/grad-scoreboard/package.json b/node_modules/grad-scoreboard/package.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "tvt-wita2016",
     "description": "Where is the agent?",
-    "version": "0.1.1",
+    "version": "0.2.0",
     "contributors": [
         {
             "name": "XiviD"