From 3e7a62560addd293b52e4790b072296da422e601 Mon Sep 17 00:00:00 2001 From: "DESKTOP-UH65DCE\\MusTanG" Date: Sun, 22 Oct 2017 09:41:00 -0500 Subject: [PATCH] cfglocations setVariable correction --- Sources/epoch_code/compile/setup/masterLoop/Event5.sqf | 2 +- Sources/epoch_code/compile/setup/masterLoop/init.sqf | 5 +---- Sources/epoch_server/init/server_init.sqf | 3 ++- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Sources/epoch_code/compile/setup/masterLoop/Event5.sqf b/Sources/epoch_code/compile/setup/masterLoop/Event5.sqf index 8368c3ea..a979b19e 100644 --- a/Sources/epoch_code/compile/setup/masterLoop/Event5.sqf +++ b/Sources/epoch_code/compile/setup/masterLoop/Event5.sqf @@ -1,6 +1,6 @@ _position = getPosATL player; -_nearestLocations = nearestLocations[player, _radioactiveLocations, 300]; +_nearestLocations = nearestLocations[player, ["NameLocal"], 300]; EPOCH_nearestLocations = _nearestLocations; _powerSources = nearestObjects[player, ["Land_spp_Tower_F","Land_wpp_Turbine_V2_F","Land_wpp_Turbine_V1_F","SolarGen_EPOCH","Land_Wreck_Satellite_EPOCH"], _energyRange]; diff --git a/Sources/epoch_code/compile/setup/masterLoop/init.sqf b/Sources/epoch_code/compile/setup/masterLoop/init.sqf index 5a2fb39c..ac02f4a8 100644 --- a/Sources/epoch_code/compile/setup/masterLoop/init.sqf +++ b/Sources/epoch_code/compile/setup/masterLoop/init.sqf @@ -336,10 +336,7 @@ EPOCH_ActiveTraderMission = []; _LastMissionTrigger = 0; // setup radio active locations -//Commented out by Raymix: Does not ser variable on locations for some reason -/* { - _x params ["_loc", "_rads"]; + _x params ["_loc", "_rads","_markers"]; _loc setVariable ["EPOCH_Rads", _rads]; } forEach (missionNamespace getVariable ["EPOCH_radioactiveLocations", []]); -*/ diff --git a/Sources/epoch_server/init/server_init.sqf b/Sources/epoch_server/init/server_init.sqf index 25950bdf..3546338c 100644 --- a/Sources/epoch_server/init/server_init.sqf +++ b/Sources/epoch_server/init/server_init.sqf @@ -271,9 +271,10 @@ if !(_radioactiveLocations isEqualTo []) then { _locations = _locations - [_selectedLoc]; _locSize = size _selectedLoc; _radius = sqrt((_locSize select 0)^2 + (_locSize select 1)^2); - _radioactiveLocationsTmp pushBack [_selectedLoc,[random 666,_radius]]; private _position = locationPosition _selectedLoc; + _createdLoc = createLocation ["NameLocal", _position, _radius, _radius]; _markers = ["Radiation", _position] call EPOCH_server_createGlobalMarkerSet; + _radioactiveLocationsTmp pushBack [_createdLoc,[random 666,_radius],_markers]; }; }; };