mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Merge pull request #2387 from acemod/FixHCPPE
Fix that PPEffects Throw a error on HC
This commit is contained in:
commit
7e5ab07e32
@ -10,6 +10,8 @@
|
|||||||
|
|
||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
|
if (!hasInterface) exitWith {};
|
||||||
|
|
||||||
private ["_show"];
|
private ["_show"];
|
||||||
PARAMS_1(_id);
|
PARAMS_1(_id);
|
||||||
_show = if (count _this > 1) then {_this select 1} else {false};
|
_show = if (count _this > 1) then {_this select 1} else {false};
|
||||||
|
@ -29,7 +29,7 @@ if (isServer) then {
|
|||||||
}] call EFUNC(common,addEventHandler);
|
}] call EFUNC(common,addEventHandler);
|
||||||
};
|
};
|
||||||
|
|
||||||
if !(hasInterface) exitWith {};
|
if (!hasInterface) exitWith {};
|
||||||
|
|
||||||
GVAR(PlacedCount) = 0;
|
GVAR(PlacedCount) = 0;
|
||||||
GVAR(Setup) = objNull;
|
GVAR(Setup) = objNull;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
// Exit on Headless as well
|
// Exit on Headless as well
|
||||||
if !(hasInterface) exitWith {};
|
if (!hasInterface) exitWith {};
|
||||||
|
|
||||||
LOG(MSG_INIT);
|
LOG(MSG_INIT);
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
if !(hasInterface) exitWith {};
|
if (!hasInterface) exitWith {};
|
||||||
|
|
||||||
// Setup ppEffect
|
// Setup ppEffect
|
||||||
GVAR(GForces_CC) = ppEffectCreate ["ColorCorrections", 4215];
|
GVAR(GForces_CC) = ppEffectCreate ["ColorCorrections", 4215];
|
||||||
|
@ -14,6 +14,7 @@
|
|||||||
* Public: Yes
|
* Public: Yes
|
||||||
*/
|
*/
|
||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
if (call FUNC(ExternalCamera)) exitWith {};
|
if (call FUNC(ExternalCamera)) exitWith {};
|
||||||
if ([ace_player] call FUNC(isGogglesVisible)) exitWith {
|
if ([ace_player] call FUNC(isGogglesVisible)) exitWith {
|
||||||
100 cutRsc["RscACE_GogglesEffects", "PLAIN",2,false];
|
100 cutRsc["RscACE_GogglesEffects", "PLAIN",2,false];
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
* Public: No
|
* Public: No
|
||||||
*/
|
*/
|
||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
private["_postProcessColour", "_postProcessTintAmount", "_glassesClassname", "_glassImagePath"];
|
private["_postProcessColour", "_postProcessTintAmount", "_glassesClassname", "_glassImagePath"];
|
||||||
|
|
||||||
_glassesClassname = _this select 0;
|
_glassesClassname = _this select 0;
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
["flashbangExplosion", DFUNC(flashbangExplosionEH)] call EFUNC(common,addEventHandler);
|
["flashbangExplosion", DFUNC(flashbangExplosionEH)] call EFUNC(common,addEventHandler);
|
||||||
|
|
||||||
if !(hasInterface) exitWith {};
|
if (!hasInterface) exitWith {};
|
||||||
|
|
||||||
GVAR(flashbangPPEffectCC) = ppEffectCreate ["ColorCorrections", 4265];
|
GVAR(flashbangPPEffectCC) = ppEffectCreate ["ColorCorrections", 4265];
|
||||||
GVAR(flashbangPPEffectCC) ppEffectForceInNVG true;
|
GVAR(flashbangPPEffectCC) ppEffectForceInNVG true;
|
||||||
|
@ -94,7 +94,7 @@ _affected = _grenade nearEntities ["CAManBase", 20];
|
|||||||
}, [_light], 0.1] call EFUNC(common,waitAndExecute);
|
}, [_light], 0.1] call EFUNC(common,waitAndExecute);
|
||||||
|
|
||||||
// blind player
|
// blind player
|
||||||
if (_strength > 0.1) then {
|
if (_strength > 0.1 && hasInterface) then {
|
||||||
GVAR(flashbangPPEffectCC) ppEffectEnable true;
|
GVAR(flashbangPPEffectCC) ppEffectEnable true;
|
||||||
GVAR(flashbangPPEffectCC) ppEffectAdjust [1,1,(0.8 + _strength) min 1,[1,1,1,0],[0,0,0,1],[0,0,0,0]];
|
GVAR(flashbangPPEffectCC) ppEffectAdjust [1,1,(0.8 + _strength) min 1,[1,1,1,0],[0,0,0,1],[0,0,0,0]];
|
||||||
GVAR(flashbangPPEffectCC) ppEffectCommit 0.01;
|
GVAR(flashbangPPEffectCC) ppEffectCommit 0.01;
|
||||||
|
@ -13,6 +13,7 @@
|
|||||||
*/
|
*/
|
||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
|
if (!hasInterface) exitWith {};
|
||||||
params ["_huntIR"];
|
params ["_huntIR"];
|
||||||
|
|
||||||
GVAR(huntIR) = _huntIR;
|
GVAR(huntIR) = _huntIR;
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
// fixes laser when being captured. Needed, because the selectionPosition of the right hand is used
|
// fixes laser when being captured. Needed, because the selectionPosition of the right hand is used
|
||||||
["SetHandcuffed", {if (_this select 1) then {(_this select 0) action ["GunLightOff", _this select 0]};}] call EFUNC(common,addEventHandler);
|
["SetHandcuffed", {if (_this select 1) then {(_this select 0) action ["GunLightOff", _this select 0]};}] call EFUNC(common,addEventHandler);
|
||||||
|
|
||||||
if !(hasInterface) exitWith {};
|
if (!hasInterface) exitWith {};
|
||||||
|
|
||||||
GVAR(nearUnits) = [];
|
GVAR(nearUnits) = [];
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
if !(hasInterface) exitWith {};
|
if (!hasInterface) exitWith {};
|
||||||
|
|
||||||
PARAMS_3(_logic,_units,_activated);
|
PARAMS_3(_logic,_units,_activated);
|
||||||
|
|
||||||
|
@ -33,6 +33,8 @@ GVAR(heartBeatSounds_Slow) = ["ACE_heartbeat_slow_1", "ACE_heartbeat_slow_2"];
|
|||||||
|
|
||||||
|
|
||||||
// Initialize all effects
|
// Initialize all effects
|
||||||
|
if (hasInterface) then {
|
||||||
|
|
||||||
_fnc_createEffect = {
|
_fnc_createEffect = {
|
||||||
private "_effect";
|
private "_effect";
|
||||||
params ["_type", "_layer", "_default"];
|
params ["_type", "_layer", "_default"];
|
||||||
@ -241,7 +243,7 @@ GVAR(lastHeartBeatSound) = ACE_time;
|
|||||||
};
|
};
|
||||||
|
|
||||||
}, 0, []] call CBA_fnc_addPerFrameHandler;
|
}, 0, []] call CBA_fnc_addPerFrameHandler;
|
||||||
|
};
|
||||||
|
|
||||||
["SettingsInitialized", {
|
["SettingsInitialized", {
|
||||||
if (GVAR(level) == 2) exitwith {
|
if (GVAR(level) == 2) exitwith {
|
||||||
|
@ -21,6 +21,8 @@
|
|||||||
*/
|
*/
|
||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
|
if (!hasInterface) exitWith {};
|
||||||
|
|
||||||
private ["_vehicle", "_weapon", "_ammo", "_magazine", "_player"];
|
private ["_vehicle", "_weapon", "_ammo", "_magazine", "_player"];
|
||||||
|
|
||||||
_vehicle = _this select 0;
|
_vehicle = _this select 0;
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
*/
|
*/
|
||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
|
if (!hasInterface) exitWith {};
|
||||||
private ["_brightness"];
|
private ["_brightness"];
|
||||||
|
|
||||||
PARAMS_2(_player,_changeInBrightness);
|
PARAMS_2(_player,_changeInBrightness);
|
||||||
|
@ -15,6 +15,8 @@
|
|||||||
*/
|
*/
|
||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
|
if (!hasInterface) exitWith {};
|
||||||
|
|
||||||
private ["_currentVehicle", "_grainSetting", "_blurSetting", "_radBlurSetting", "_config", "_hmd", "_cameraView", "_turret"];
|
private ["_currentVehicle", "_grainSetting", "_blurSetting", "_radBlurSetting", "_config", "_hmd", "_cameraView", "_turret"];
|
||||||
|
|
||||||
_currentVehicle = vehicle ACE_player;
|
_currentVehicle = vehicle ACE_player;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
// by esteldunedain
|
// by esteldunedain
|
||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
if !(hasInterface) exitWith {};
|
if (!hasInterface) exitWith {};
|
||||||
|
|
||||||
// Add keybinds
|
// Add keybinds
|
||||||
["ACE3 Weapons", QGVAR(unjamWeapon), localize LSTRING(UnjamWeapon),
|
["ACE3 Weapons", QGVAR(unjamWeapon), localize LSTRING(UnjamWeapon),
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
// by esteldunedain
|
// by esteldunedain
|
||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
if !(hasInterface) exitWith {};
|
if (!hasInterface) exitWith {};
|
||||||
|
|
||||||
// Add keybinds
|
// Add keybinds
|
||||||
["ACE3 Weapons", QGVAR(checkAmmo), localize LSTRING(checkAmmo),
|
["ACE3 Weapons", QGVAR(checkAmmo), localize LSTRING(checkAmmo),
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
*/
|
*/
|
||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
if !(hasInterface) exitWith {};
|
if (!hasInterface) exitWith {};
|
||||||
|
|
||||||
// Check inventory when it changes
|
// Check inventory when it changes
|
||||||
["playerInventoryChanged", {
|
["playerInventoryChanged", {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
// Exit on Headless
|
// Exit on Headless
|
||||||
if !(hasInterface) exitWith {};
|
if (!hasInterface) exitWith {};
|
||||||
|
|
||||||
// Add interaction menu exception
|
// Add interaction menu exception
|
||||||
["isNotSitting", {!((_this select 0) getVariable [QGVAR(isSitting), false])}] call EFUNC(common,addCanInteractWithCondition);
|
["isNotSitting", {!((_this select 0) getVariable [QGVAR(isSitting), false])}] call EFUNC(common,addCanInteractWithCondition);
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
params [["_set",true,[true]]];
|
params [["_set",true,[true]]];
|
||||||
|
|
||||||
// Only clients can be spectators
|
// Only clients can be spectators
|
||||||
if !(hasInterface) exitWith {};
|
if (!hasInterface) exitWith {};
|
||||||
|
|
||||||
// Exit if no change
|
// Exit if no change
|
||||||
if (_set isEqualTo GVAR(isSet)) exitwith {};
|
if (_set isEqualTo GVAR(isSet)) exitwith {};
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
params [["_newUnits",[],[[]]],["_blacklist",false,[false]]];
|
params [["_newUnits",[],[[]]],["_blacklist",false,[false]]];
|
||||||
|
|
||||||
// Function only matters on player clients
|
// Function only matters on player clients
|
||||||
if !(hasInterface) exitWith {};
|
if (!hasInterface) exitWith {};
|
||||||
|
|
||||||
// If adding to a list we can exit here, since it won't show up until the UI refreshes anyway
|
// If adding to a list we can exit here, since it won't show up until the UI refreshes anyway
|
||||||
if !(_newUnits isEqualTo []) exitWith {
|
if !(_newUnits isEqualTo []) exitWith {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
// by esteldunedain
|
// by esteldunedain
|
||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
if !(hasInterface) exitWith {};
|
if (!hasInterface) exitWith {};
|
||||||
|
|
||||||
// Add keybinds
|
// Add keybinds
|
||||||
["ACE3 Vehicles", QGVAR(speedLimiter), localize LSTRING(SpeedLimiter),
|
["ACE3 Vehicles", QGVAR(speedLimiter), localize LSTRING(SpeedLimiter),
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
// by esteldunedain
|
// by esteldunedain
|
||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
if !(hasInterface) exitWith {};
|
if (!hasInterface) exitWith {};
|
||||||
|
|
||||||
// Add keybinds
|
// Add keybinds
|
||||||
["ACE3 Weapons", QGVAR(SelectPistolNew), localize LSTRING(SelectPistol),
|
["ACE3 Weapons", QGVAR(SelectPistolNew), localize LSTRING(SelectPistol),
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
if !(hasInterface) exitWith {};
|
if (!hasInterface) exitWith {};
|
||||||
|
|
||||||
GVAR(trackedBullets) = [];
|
GVAR(trackedBullets) = [];
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user