Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3836 from acemod/fix_null_rallypoint

Browse Source 
fix rallypoint being objNull, when created via 'createvehicle'
This commit is contained in:
bux578 2016-05-29 13:57:44 +02:00
commit b4cb49ffec
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
addons/respawn/functions/fnc_initRallypoint.sqf
View File

@ -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.");
};