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

Working commit

Browse Source
This commit is contained in:
Glowbal 2015-04-06 14:51:17 +02:00
parent 8e176eff55
commit 661d93e82c
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/medical/ACE_Medical_Treatments.hpp
View File

@ -77,7 +77,7 @@ class ACE_Medical_Actions {
callbackProgress = ""; callbackProgress = "";
animationPatient = ""; animationPatient = "";
animationPatientUnconscious = ""; animationPatientUnconscious = "";
itemConsumed = 0; itemConsumed = 1;
litter[] = {}; litter[] = {};
}; };
}; };
@ -276,7 +276,7 @@ class ACE_Medical_Actions {
callbackProgress = ""; callbackProgress = "";
animationPatient = ""; animationPatient = "";
animationPatientUnconscious = ""; animationPatientUnconscious = "";
itemConsumed = 0; itemConsumed = 1;
litter[] = {}; litter[] = {};
}; };
}; };

5
addons/medical/CfgEventHandlers.hpp
View File

@ -17,6 +17,11 @@ class Extended_Init_EventHandlers {
init = QUOTE(call COMPILE_FILE(XEH_init)); init = QUOTE(call COMPILE_FILE(XEH_init));
}; };
}; };
class ACE_bodyBag {
class ADDON {
init = QUOTE(_this call EDFUNC(dragging,initObject));
};
};
}; };
class Extended_Respawn_EventHandlers { class Extended_Respawn_EventHandlers {

1
addons/medical/CfgVehicles.hpp
View File

@ -619,6 +619,7 @@ class CfgVehicles {
model = QUOTE(PATHTOF(data\bodybag.p3d)); model = QUOTE(PATHTOF(data\bodybag.p3d));
icon = ""; icon = "";
displayName = $STR_ACE_MEDICAL_BODYBAG_DISPLAY; displayName = $STR_ACE_MEDICAL_BODYBAG_DISPLAY;
EGVAR(dragging,canDrag) = 1;
}; };
// Medical litter classes // Medical litter classes

10
addons/medical/functions/fnc_actionPlaceInBodyBag.sqf
View File

@ -18,22 +18,14 @@ private ["_target","_caller", "_nameOfUnit", "_onPosition", "_bodyBagCreated"];
_caller = _this select 0; _caller = _this select 0;
_target = _this select 1; _target = _this select 1;
if !([_caller, "ACE_itemBodyBag"] call EFUNC(common,hasItem)) exitwith {};
[_caller, "ACE_itemBodyBag"] call EFUNC(common,useItem);
_nameOfUnit = [_target] call EFUNC(common,getName); _nameOfUnit = [_target] call EFUNC(common,getName);
if (alive _target) then { if (alive _target) then {
// force kill the unit.
[_target, true] call FUNC(setDead); [_target, true] call FUNC(setDead);
}; };
_onPosition = getPos _target; _onPosition = getPos _target;
deleteVehicle _target; deleteVehicle _target;
_bodyBagCreated = createVehicle ["ACE_bodyBag", _onPosition, [], 0, "NONE"]; _bodyBagCreated = createVehicle ["ACE_bodyBag", _onPosition, [], 0, "NONE"];
// reset the position to ensure it is on the correct one. // reset the position to ensure it is on the correct one.
_bodyBagCreated setPos _onPosition; _bodyBagCreated setPos [_onPosition select 0, _onPosition select 1, (_onPosition select 2) + 0.2];
// TODO Does this need to be something with QUOTE(DEFUNC)?
[[_bodyBagCreated], QUOTE(DEFUNC(common,revealObject)), true] call call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */
_bodyBagCreated; _bodyBagCreated;