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

Added events to carry object.

Browse Source
This commit is contained in:
Thomas Kooi 2015-01-20 18:57:53 +01:00
parent 9a0b73bf3a
commit a92430b701
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/common/CfgEventHandlers.hpp
View File

@ -43,3 +43,19 @@ class Extended_Respawn_EventHandlers {
}; };
}; };
}; };
class Extended_Killed_EventHandlers {
class CAManBase {
class GVAR(dropObject) {
Killed = QUOTE(if (local (_this select 0)) then {[ARR_2(_this select 0, ObjNull)] call FUNC(carryObj)};);
};
};
};
class Extended_GetIn_EventHandlers {
class CAManBase {
class GVAR(dropObject) {
GetIn = QUOTE(if (local (_this select 0)) then {[ARR_2(_this select 0, ObjNull)] call FUNC(carryObj)};);
};
};
};

12
addons/common/functions/fnc_carryObj.sqf
View File

@ -36,12 +36,9 @@ if (((typeName _to) == "OBJECT" && (isNull ([_unit] call FUNC(getCarriedObj))))
_to attachTo [_unit,(_this select 2)]; _to attachTo [_unit,(_this select 2)];
[format["fnc_carryObj - UNIT: %1 TO %2 - attachTo offset: %3",_unit,_to,(_this select 2)],2] call FUNC(debug); [format["fnc_carryObj - UNIT: %1 TO %2 - attachTo offset: %3",_unit,_to,(_this select 2)],2] call FUNC(debug);
}; };
} else {
[format["fnc_carryObj - UNIT: %1 TO %2 - Script expects external handling of attachTo Command. Exiting",_unit,_to],2] call FUNC(debug);
}; };
// ["carryObject", [_unit], [_unit, _to, _fallDown]] call EFUNC(common,targetEvent);
[[_unit, _to, _fallDown],"carryObject"] call FUNC(raiseScriptedEvent_f); ["carryObject", [_unit, _to, _fallDown]] call ace_common_fnc_localEvent;
}; };
} else { } else {
if (!isNull ([_unit] call FUNC(getCarriedObj))) then { if (!isNull ([_unit] call FUNC(getCarriedObj))) then {
@ -59,13 +56,14 @@ if (((typeName _to) == "OBJECT" && (isNull ([_unit] call FUNC(getCarriedObj))))
_positionUnit set [2, ((getPosASL _unit) select 2) + 0.1]; _positionUnit set [2, ((getPosASL _unit) select 2) + 0.1];
_carriedObj setPosASL _positionUnit; _carriedObj setPosASL _positionUnit;
}; };
[[_unit, _carriedObj],"carryObjectDropped"] call FUNC(raiseScriptedEvent_f);
[[_unit] call FUNC(getCarriedObj), objNull] call FUNC(setCarriedBy); [[_unit] call FUNC(getCarriedObj), objNull] call FUNC(setCarriedBy);
_unit setvariable [QGVAR(carriedObj),_to,true]; _unit setvariable [QGVAR(carriedObj),_to,true];
_return = true; _return = true;
[[_unit, _to, _fallDown],"carryObject"] call FUNC(raiseScriptedEvent_f); // ["carryObjectDropped", [_unit], [_unit, _to, _fallDown]] call EFUNC(common,targetEvent);
["carryObjectDropped", [_unit, _to, _fallDown]] call ace_common_fnc_localEvent;
}; };
}; };
} else { } else {

4
addons/common/functions/fnc_debug.sqf
View File

@ -9,8 +9,8 @@
*/ */
#include "script_component.hpp" #include "script_component.hpp"
#define DEFAULT_LOGGING_LEVEL -1 #define DEFAULT_LOGGING_LEVEL 4
#define DEFAULT_TEXT_DISPLAY -1 #define DEFAULT_TEXT_DISPLAY 4
private ["_msg", "_level", "_prefix", "_defaultLoglevel","_defaultLogDisplayLevel", "_message", "_from"]; private ["_msg", "_level", "_prefix", "_defaultLoglevel","_defaultLogDisplayLevel", "_message", "_from"];
_msg = _this select 0; _msg = _this select 0;