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

more replacing

Browse Source
This commit is contained in:
commy2 2016-05-18 11:57:40 +02:00
parent da70854568
commit d93132dac8
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/fastroping/functions/fnc_fastRope.sqf
View File

@ -37,4 +37,4 @@ _vehicle setVariable [QGVAR(deployedRopes), _deployedRopes, true];
//Start server PFH asap //Start server PFH asap
[QGVAR(startFastRope), [_unit, _vehicle, _usableRope, _usableRopeIndex, false]] call EFUNC(common,serverEvent); [QGVAR(startFastRope), [_unit, _vehicle, _usableRope, _usableRopeIndex, false]] call EFUNC(common,serverEvent);
moveOut _unit; moveOut _unit;
[FUNC(fastRopeLocalPFH), 0, [_unit, _vehicle, _usableRope, _usableRopeIndex, ACE_diagTime]] call CBA_fnc_addPerFrameHandler; [FUNC(fastRopeLocalPFH), 0, [_unit, _vehicle, _usableRope, _usableRopeIndex, diag_tickTime]] call CBA_fnc_addPerFrameHandler;

2
addons/fastroping/functions/fnc_fastRopeLocalPFH.sqf
View File

@ -43,7 +43,7 @@ if (isNull attachedTo _unit) exitWith {
[_pfhHandle] call CBA_fnc_removePerFrameHandler; [_pfhHandle] call CBA_fnc_removePerFrameHandler;
}; };
if (ACE_diagTime > _timeToPlayRopeSound) then { if (diag_tickTime > _timeToPlayRopeSound) then {
_arguments set [4, (_timeToPlayRopeSound + 1)]; _arguments set [4, (_timeToPlayRopeSound + 1)];
playSound QGVAR(Rope); playSound QGVAR(Rope);
}; };

2
addons/medical/functions/fnc_addVitalLoop.sqf
View File

@ -27,4 +27,4 @@ if ((_unit getVariable[QGVAR(addedToUnitLoop),false] || !alive _unit) && !_force
// Schedule the loop to be executed again 1 sec later // Schedule the loop to be executed again 1 sec later
// @todo: should the loop be started righ away instead? // @todo: should the loop be started righ away instead?
_unit setVariable [QGVAR(addedToUnitLoop), true, true]; _unit setVariable [QGVAR(addedToUnitLoop), true, true];
[DFUNC(vitalLoop), [_unit, ACE_time], 1] call EFUNC(common,waitAndExecute); [DFUNC(vitalLoop), [_unit, CBA_missionTime], 1] call EFUNC(common,waitAndExecute);

2
addons/medical/functions/fnc_litterCleanupLoop.sqf
View File

@ -15,7 +15,7 @@
{ {
_x params ["_time", "_objects"]; _x params ["_time", "_objects"];
if (ACE_time - _time >= GVAR(litterCleanUpDelay)) then { if (CBA_missionTime - _time >= GVAR(litterCleanUpDelay)) then {
{ {
deleteVehicle _x; deleteVehicle _x;
} forEach _objects; } forEach _objects;

2
addons/medical/functions/fnc_reviveStateLoop.sqf
View File

@ -35,7 +35,7 @@ if ((alive _unit) && {(vehicle _unit) != _unit} && {!alive (vehicle _unit)}) the
}; };
// If the timer run out, let the unit die and exit the loop // If the timer run out, let the unit die and exit the loop
if (GVAR(maxReviveTime) > 0 && {ACE_time - _startTime > GVAR(maxReviveTime)}) exitwith { if (GVAR(maxReviveTime) > 0 && {CBA_missionTime - _startTime > GVAR(maxReviveTime)}) exitwith {
_unit setVariable [QGVAR(inReviveState), nil, true]; _unit setVariable [QGVAR(inReviveState), nil, true];
_unit setVariable [QGVAR(reviveStartTime), nil]; _unit setVariable [QGVAR(reviveStartTime), nil];
[_unit, true] call FUNC(setDead); [_unit, true] call FUNC(setDead);

4
addons/medical/functions/fnc_vitalLoop.sqf
View File

@ -29,7 +29,7 @@ if (!local _unit) exitWith {
}; };
// Handle unit vitals // Handle unit vitals
[_unit, ACE_time - _lastTime] call FUNC(handleUnitVitals); [_unit, CBA_missionTime - _lastTime] call FUNC(handleUnitVitals);
// Play injured sounds // Play injured sounds
private _pain = _unit getVariable [QGVAR(pain), 0]; private _pain = _unit getVariable [QGVAR(pain), 0];
@ -45,4 +45,4 @@ if (_pain > (_unit getVariable [QGVAR(painSuppress), 0])) then {
}; };
// Schedule the loop to be executed again 1 sec later // Schedule the loop to be executed again 1 sec later
[DFUNC(vitalLoop), [_unit, ACE_time], 1] call EFUNC(common,waitAndExecute); [DFUNC(vitalLoop), [_unit, CBA_missionTime], 1] call EFUNC(common,waitAndExecute);

2
addons/overheating/functions/fnc_loadCoolestSpareBarrel.sqf
View File

@ -47,7 +47,7 @@ TRACE_3("loadCoolestSpareBarrel5",_coolestTemp,_coolestMag,_weaponTemp);
_gunner setVariable [format [QGVAR(%1_temp), _weapon], _coolestTemp, true]; _gunner setVariable [format [QGVAR(%1_temp), _weapon], _coolestTemp, true];
// Heat up the coolest barrel to the former weapon temperature // Heat up the coolest barrel to the former weapon temperature
[GVAR(storedSpareBarrels), _coolestMag, [_weaponTemp, ACE_Time, _barrelMass]] call CBA_fnc_hashSet; [GVAR(storedSpareBarrels), _coolestMag, [_weaponTemp, CBA_missionTime, _barrelMass]] call CBA_fnc_hashSet;
// Send an event so the machines of the assistant and gunner can show the hint // Send an event so the machines of the assistant and gunner can show the hint
["showWeaponTemperature", [_assistant, _gunner], [_gunner, _weapon]] call EFUNC(common,targetEvent); ["showWeaponTemperature", [_assistant, _gunner], [_gunner, _weapon]] call EFUNC(common,targetEvent);

4
addons/overheating/functions/fnc_updateSpareBarrelsTemperaturesThread.sqf
View File

@ -25,14 +25,14 @@ TRACE_1("updateSpareBarrelsTemperaturesThread2",_pairs);
_value params ["_initialTemp","_initialTime", "_barrelMass"]; _value params ["_initialTemp","_initialTime", "_barrelMass"];
// Calculate cooling // Calculate cooling
private _finalTemp = [_initialTemp, _barrelMass, ACE_time - _initialTime] call FUNC(calculateCooling); private _finalTemp = [_initialTemp, _barrelMass, CBA_missionTime - _initialTime] call FUNC(calculateCooling);
TRACE_4("updateSpareBarrelsTemperaturesThread3",_barrelMagazineID,_initialTemp,_finalTemp,_barrelMass); TRACE_4("updateSpareBarrelsTemperaturesThread3",_barrelMagazineID,_initialTemp,_finalTemp,_barrelMass);
if (_finalTemp < 5) then { if (_finalTemp < 5) then {
// The barrel is cool enough to keep calculating. Remove it from the hash // The barrel is cool enough to keep calculating. Remove it from the hash
[GVAR(storedSpareBarrels), _barrelMagazineID] call CBA_fnc_hashRem; [GVAR(storedSpareBarrels), _barrelMagazineID] call CBA_fnc_hashRem;
} else { } else {
// Store the new temp // Store the new temp
[GVAR(storedSpareBarrels), _barrelMagazineID, [_finalTemp, ACE_time, _barrelMass]] call CBA_fnc_hashSet; [GVAR(storedSpareBarrels), _barrelMagazineID, [_finalTemp, CBA_missionTime, _barrelMass]] call CBA_fnc_hashSet;
}; };
} forEach _pairs; } forEach _pairs;