Merge pull request #2964 from acemod/fixUnload

Fix refuel unconc error - Man unloading for air
This commit is contained in:
PabstMirror 2015-12-07 19:08:25 -06:00
commit dec74a9d2d
3 changed files with 4 additions and 3 deletions

View File

@ -15,6 +15,7 @@
#define GROUP_SWITCH_ID QUOTE(FUNC(loadPerson))
params ["_unit", "_vehicle"];
TRACE_2("params",_unit,_vehicle);
private ["_validVehiclestate", "_emptyPos", "_loaded"];
@ -30,7 +31,7 @@ if (_vehicle isKindOf "Ship") then {
_emptyPos = (ASLToAGL getPosASL _vehicle) findEmptyPosition [0, 13, typeof _unit]; // TODO: if spot is underwater pick another spot.
} else {
if (_vehicle isKindOf "Air") then {
if (speed _vehicle > 1 || {isTouchingGround _vehicle}) then {
if (speed _vehicle > 1 || {!isTouchingGround _vehicle}) then {
_validVehiclestate = false;
};

View File

@ -1,4 +1,4 @@
#include "script_component.hpp"
["medical_onUnconscious", {_this call FUNC(handleOnUnconscious)}] call EFUNC(common,addEventHandler);
["medical_onUnconscious", {_this call FUNC(handleUnconscious)}] call EFUNC(common,addEventHandler);
["playerVehicleChanged", {params ["_unit"]; [_unit] call FUNC(dropAmmo)}] call EFUNC(common,addEventHandler);

View File

@ -1,3 +1,3 @@
#include "script_component.hpp"
["medical_onUnconscious", {_this call FUNC(handleOnUnconscious)}] call EFUNC(common,addEventHandler);
["medical_onUnconscious", {_this call FUNC(handleUnconscious)}] call EFUNC(common,addEventHandler);