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

Sitting - Fix ACEX Merge (#8577)

Browse Source
This commit is contained in:
jonpas 2021-10-22 15:16:42 +02:00 committed by GitHub
parent 285c44bf15
commit b7f9aee2d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/sitting/functions/fnc_addSitActions.sqf
View File

@ -25,7 +25,7 @@ if (_seat isEqualType objNull) then {
private _configFile = configFile >> "CfgVehicles" >> _type;
// Exit if sitting disabled or the object is not specified as a seat
if (!XGVAR(enable) || {getNumber (_configFile >> QGVAR(canSit)) != 1}) exitWith {};
if (!XGVAR(enable) || {getNumber (_configFile >> QXGVAR(canSit)) != 1}) exitWith {};
// Exit if class already initialized
if (_type in GVAR(initializedClasses)) exitWith {};
@ -33,8 +33,8 @@ GVAR(initializedClasses) pushBack _type;
TRACE_1("Adding Sit Action",_type);
private _sitPosition = getArray (_configFile >> QGVAR(sitPosition));
private _interactPosition = getArray (_configFile >> QGVAR(interactPosition));
private _sitPosition = getArray (_configFile >> QXGVAR(sitPosition));
private _interactPosition = getArray (_configFile >> QXGVAR(interactPosition));
if (count _sitPosition != count _interactPosition) exitWith {
WARNING_1("Invalid sitting configuration of %1!",_type);

4
addons/sitting/functions/fnc_sit.sqf
View File

@ -38,8 +38,8 @@ private _actionID = _player addAction [
// Read config
private _configFile = configFile >> "CfgVehicles" >> typeOf _seat;
private _sitDirection = (getDir _seat) + (_seat getVariable [QGVAR(sitDirection), getNumber (_configFile >> QGVAR(sitDirection))]);
private _sitPositionAll = _seat getVariable [QGVAR(sitPosition), getArray (_configFile >> QGVAR(sitPosition))];
private _sitDirection = (getDir _seat) + (_seat getVariable [QXGVAR(sitDirection), getNumber (_configFile >> QXGVAR(sitDirection))]);
private _sitPositionAll = _seat getVariable [QXGVAR(sitPosition), getArray (_configFile >> QXGVAR(sitPosition))];
private _multiSitting = (_sitPositionAll select 0) isEqualType [];
private _sitPosition = _sitPositionAll;