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 branch 'master' into release

Browse Source
This commit is contained in:
Glowbal 2015-07-27 08:41:00 +02:00
commit d0adb6c317
3 changed files with 48 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/common/functions/fnc_loadPerson.sqf
View File

@ -12,7 +12,7 @@
#define GROUP_SWITCH_ID QUOTE(FUNC(loadPerson))
private ["_caller", "_unit","_vehicle", "_loadcar", "_loadhelicopter", "_loadtank"];
private ["_caller", "_unit","_vehicle", "_loadcar", "_loadhelicopter", "_loadtank","_loadboat"];
_caller = [_this, 0, ObjNull,[ObjNull]] call BIS_fnc_Param;
_unit = [_this, 1, ObjNull,[ObjNull]] call BIS_fnc_Param;
_vehicle = ObjNull;
@ -30,6 +30,11 @@ if (_unit distance _loadcar <= 10) then {
_loadtank = nearestObject [_unit, "tank"];
if (_unit distance _loadtank <= 10) then {
_vehicle = _loadtank;
} else {
_loadboat = nearestObject [_unit, "ship"];
if (_unit distance _loadboat <= 10) then {
_vehicle = _loadboat;
};
};
};
};

51
addons/common/functions/fnc_loadPersonLocal.sqf
View File

@ -10,35 +10,48 @@
#include "script_component.hpp"
private ["_unit","_vehicle","_caller","_handle","_loaded"];
private ["_unit","_vehicle","_caller","_handle","_loaded","_slotsOpen"];
_unit = [_this, 0, ObjNull,[ObjNull]] call BIS_fnc_Param;
_vehicle = [_this, 1, ObjNull,[ObjNull]] call BIS_fnc_Param;
_caller = [_this, 2, ObjNull,[ObjNull]] call BIS_fnc_Param;
_slotsOpen = false;
if (!alive _unit) then {
_unit = [_unit,_caller] call FUNC(makeCopyOfBody);
};
_unit moveInCargo _vehicle;
_loaded = _vehicle getvariable [QGVAR(loaded_persons),[]];
_loaded pushback _unit;
_vehicle setvariable [QGVAR(loaded_persons),_loaded,true];
if (!([_unit] call FUNC(isAwake))) then {
_handle = [_unit,_vehicle] spawn {
private ["_unit","_vehicle"];
_unit = _this select 0;
_vehicle = _this select 1;
waituntil {vehicle _unit == _vehicle};
sleep 0.5;
//Save the "awake" animation before applying the death animation
if (vehicle _unit == _vehicle) then {
_unit setVariable [QEGVAR(medical,vehicleAwakeAnim), [_vehicle, (animationState _unit)]];
};
[_unit,([_unit] call FUNC(getDeathAnim)), 1, true] call FUNC(doAnimation);
};
if (_vehicle emptyPositions "cargo" > 0) then {
_unit moveInCargo _vehicle;
_slotsOpen = true;
} else {
if ([_unit] call FUNC(isArrested)) then {
if (_vehicle emptyPositions "gunner" > 0) then {
_unit moveInGunner _vehicle;
_slotsOpen = true;
};
};
if (_slotsOpen) then {
_loaded = _vehicle getvariable [QGVAR(loaded_persons),[]];
_loaded pushback _unit;
_vehicle setvariable [QGVAR(loaded_persons),_loaded,true];
if (!([_unit] call FUNC(isAwake))) then {
_handle = [_unit,_vehicle] spawn {
private ["_unit","_vehicle"];
_unit = _this select 0;
_vehicle = _this select 1;
waituntil {vehicle _unit == _vehicle};
sleep 0.5;
//Save the "awake" animation before applying the death animation
if (vehicle _unit == _vehicle) then {
_unit setVariable [QEGVAR(medical,vehicleAwakeAnim), [_vehicle, (animationState _unit)]];
};
[_unit,([_unit] call FUNC(getDeathAnim)), 1, true] call FUNC(doAnimation);
};
} else {
if ([_unit] call FUNC(isArrested)) then {
};
};
};

21
optionals/compat_rhs_usf3/CfgWeapons.hpp
View File

@ -56,7 +56,7 @@ class CfgWeapons
"3Rnd_SmokePurple_Grenade_shell",
"3Rnd_SmokeBlue_Grenade_shell",
"3Rnd_SmokeOrange_Grenade_shell",
//ACE3 Compatibility
"ACE_HuntIR_M203"
};
@ -102,7 +102,7 @@ class CfgWeapons
"3Rnd_SmokePurple_Grenade_shell",
"3Rnd_SmokeBlue_Grenade_shell",
"3Rnd_SmokeOrange_Grenade_shell",
//ACE3 Compatibility
"ACE_HuntIR_M203"
};
@ -175,7 +175,14 @@ class CfgWeapons
lockedTargetSound[] = {"",0,1};
};
class rhsusf_opscore_01;
class rhsusf_ach_helmet_ocp;
class rhsusf_opscore_01: rhsusf_ach_helmet_ocp {
ace_hearing_protection = 0.50;
ace_hearing_lowerVolume = 0.60;
};
class rhsusf_opscore_01_tan: rhsusf_opscore_01 {};
class rhsusf_opscore_03_ocp: rhsusf_opscore_01 {};
class rhsusf_cvc_helmet: rhsusf_opscore_01 {
ace_hearing_protection = 1;
ace_hearing_lowerVolume = 0.80;
@ -202,12 +209,4 @@ class CfgWeapons
ace_hearing_protection = 1;
ace_hearing_lowerVolume = 0.80;
};
class rhsusf_ach_helmet_ocp;
class rhsusf_opscore_01: rhsusf_ach_helmet_ocp {
ace_hearing_protection = 0.50;
ace_hearing_lowerVolume = 0.60;
};
class rhsusf_opscore_01_tan: rhsusf_opscore_01 {};
class rhsusf_opscore_03_ocp: rhsusf_opscore_01 {};
};