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 #3965 from acemod/fixDogtagRespawn

Browse Source 
Fix issue with dogtag respawn/setVariable
This commit is contained in:
Nicolás Badano 2016-06-20 17:17:02 -03:00 committed by GitHub
commit 09fd2c4895
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/dogtags/functions/fnc_canCheckDogtag.sqf
View File

@ -17,4 +17,4 @@ params ["_player", "_target"];
if (isNull _target) exitWith {false};
!alive _target || _target getVariable ["ACE_isUnconscious", false]
(!alive _target) || {_target getVariable ["ACE_isUnconscious", false]}

2
addons/dogtags/functions/fnc_canTakeDogtag.sqf
View File

@ -17,4 +17,4 @@ params ["_player", "_target"];
if (isNull _target) exitWith {false};
!alive _target || _target getVariable ["ACE_isUnconscious", false]
(!alive _target) || {_target getVariable ["ACE_isUnconscious", false]}

2
addons/dogtags/functions/fnc_checkDogtag.sqf
View File

@ -15,7 +15,7 @@
params ["_player", "_target"];
private _doubleTags = !(_target getVariable [QGVAR(dogtagTaken), false]);
private _doubleTags = (_target getVariable [QGVAR(dogtagTaken), objNull]) != _target;
private _dogTagData = [_target] call FUNC(getDogTagData);
[QGVAR(showDogtag), [_dogTagData, _doubleTags]] call CBA_fnc_localEvent;

2
addons/dogtags/functions/fnc_getDogtagItem.sqf
View File

@ -23,7 +23,7 @@ private _allDogtagDatas = missionNamespace getVariable [QGVAR(allDogtagDatas), [
private _nextID = count _allDogtags + 1;
if (_nextID > 999) exitWith {};
if (_nextID > 999) exitWith {ACE_LOGERROR("Ran out of IDs");};
private _dogTagData = [_target] call FUNC(getDogTagData);
private _item = format ["ACE_dogtag_%1", _nextID];

4
addons/dogtags/functions/fnc_takeDogtag.sqf
View File

@ -16,9 +16,9 @@
params ["_player", "_target"];
if (_target getVariable [QGVAR(dogtagTaken), false]) then {
if ((_target getVariable [QGVAR(dogtagTaken), objNull]) == _target) then {
[localize LSTRING(dogtagAlreadyTaken)] call EFUNC(common,displayText);
} else {
_target setVariable [QGVAR(dogtagTaken), true, true];
_target setVariable [QGVAR(dogtagTaken), _target, true];
[QGVAR(getDogtagItem), [_player, _target]] call CBA_fnc_serverEvent;
};