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

Use CBA_missionTime instead of ACE_Time

Browse Source
This commit is contained in:
TheMagnetar 2018-02-05 23:34:02 +01:00
parent c4ef630b1e
commit 05f977d272
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/bft/functions/fnc_handleVehicleDeviceKilled.sqf
View File

@ -23,7 +23,7 @@ private _deviceState = D_GET_DEVICE_STATE(_data);
_deviceState set [0, STATE_DESTROYED]; _deviceState set [0, STATE_DESTROYED];
_deviceState set [1, getPosASL vehicle D_GET_OWNER(_data)]; _deviceState set [1, getPosASL vehicle D_GET_OWNER(_data)];
_deviceState set [2, direction vehicle D_GET_OWNER(_data)]; _deviceState set [2, direction vehicle D_GET_OWNER(_data)];
_deviceState set [3, ACE_time]; _deviceState set [3, CBA_missionTime];
if !(isNull D_GET_OWNER(_data)) then { if !(isNull D_GET_OWNER(_data)) then {

7
addons/bft/functions/fnc_updateAvailableDevicesPosition.sqf
View File

@ -40,13 +40,12 @@ if (_startNewLoop) then {
// start a new position update loop // start a new position update loop
GVAR(positionUpdatePFEH) = [{ GVAR(positionUpdatePFEH) = [{
{ {
systemChat format ["updating position"]; if (CBA_missionTime - (AD_GET_TIME(_x)) >= (AD_GET_REFRESH_RATE(_x))) then {
if (ACE_time - (AD_GET_TIME(_x)) >= (AD_GET_REFRESH_RATE(_x))) then {
if (AD_GET_DEVICE_STATE_VALUE(_x) isEqualTo STATE_NORMAL) then { if (AD_GET_DEVICE_STATE_VALUE(_x) isEqualTo STATE_NORMAL) then {
private _deviceOwner = AD_GET_OWNER(_x); private _deviceOwner = AD_GET_OWNER(_x);
//if (!(_deviceOwner isKindOf "CAManBAse") && {!(isEngineOn _deviceOwner)}) exitwith {}; //if (!(_deviceOwner isKindOf "CAManBAse") && {!(isEngineOn _deviceOwner)}) exitwith {};
//systemChat format["updating a device position: %1", _x]; //systemChat format["updating a device position: %1", _x];
_x set [8, ACE_time]; _x set [8, CBA_missionTime];
_x set [4, getPosASL _deviceOwner]; _x set [4, getPosASL _deviceOwner];
_x set [12, direction _deviceOwner]; _x set [12, direction _deviceOwner];
} else { } else {
@ -54,7 +53,7 @@ if (_startNewLoop) then {
diag_log format["state of a device was online but ended up in drawing available devices loop!"]; diag_log format["state of a device was online but ended up in drawing available devices loop!"];
}; };
private _deviceState = AD_GET_DEVICE_STATE(_x); private _deviceState = AD_GET_DEVICE_STATE(_x);
(_x select 6) set [1, [0.6, 0.6, 0.6, (1 - ((ACE_time - (_deviceState select 3)) / 100)) max 0.4]]; (_x select 6) set [1, [0.6, 0.6, 0.6, (1 - ((CBA_missionTime - (_deviceState select 3)) / 100)) max 0.4]];
_x set [4, _deviceState select 1]; _x set [4, _deviceState select 1];
_x set [12, _deviceState select 2]; _x set [12, _deviceState select 2];
}; };

6
addons/bft_devices/functions/fnc_ifOnMouseButtonUp.sqf
View File

@ -100,6 +100,12 @@ switch (_function) do {
case "toggleInterfaceMode": { case "toggleInterfaceMode": {
[] call FUNC(toggleInterfaceMode); [] call FUNC(toggleInterfaceMode);
}; };
case "msgSend" : {
};
case "msgDelete" : {
};
}; };
true true