Merge pull request #2387 from acemod/FixHCPPE

Fix that PPEffects Throw a error on HC
This commit is contained in:
Glowbal 2015-09-15 21:04:37 +02:00
commit 7e5ab07e32
25 changed files with 30 additions and 18 deletions

View File

@ -10,6 +10,8 @@
#include "script_component.hpp"
if (!hasInterface) exitWith {};
private ["_show"];
PARAMS_1(_id);
_show = if (count _this > 1) then {_this select 1} else {false};

View File

@ -29,7 +29,7 @@ if (isServer) then {
}] call EFUNC(common,addEventHandler);
};
if !(hasInterface) exitWith {};
if (!hasInterface) exitWith {};
GVAR(PlacedCount) = 0;
GVAR(Setup) = objNull;

View File

@ -1,7 +1,7 @@
#include "script_component.hpp"
// Exit on Headless as well
if !(hasInterface) exitWith {};
if (!hasInterface) exitWith {};
LOG(MSG_INIT);

View File

@ -1,6 +1,6 @@
#include "script_component.hpp"
if !(hasInterface) exitWith {};
if (!hasInterface) exitWith {};
// Setup ppEffect
GVAR(GForces_CC) = ppEffectCreate ["ColorCorrections", 4215];

View File

@ -14,7 +14,7 @@
#include "script_component.hpp"
private ["_interval", "_player", "_newVel", "_accel", "_currentGForce", "_average", "_sum", "_classCoef", "_suitCoef", "_gBlackOut", "_gRedOut", "_g", "_gBO", "_coef", "_strength"];
EXPLODE_2_PVT(_this,_params,_pfhId);
_interval = ACE_time - GVAR(lastUpdateTime);

View File

@ -14,6 +14,7 @@
* Public: Yes
*/
#include "script_component.hpp"
if (call FUNC(ExternalCamera)) exitWith {};
if ([ace_player] call FUNC(isGogglesVisible)) exitWith {
100 cutRsc["RscACE_GogglesEffects", "PLAIN",2,false];

View File

@ -16,6 +16,7 @@
* Public: No
*/
#include "script_component.hpp"
private["_postProcessColour", "_postProcessTintAmount", "_glassesClassname", "_glassImagePath"];
_glassesClassname = _this select 0;

View File

@ -4,7 +4,7 @@
["flashbangExplosion", DFUNC(flashbangExplosionEH)] call EFUNC(common,addEventHandler);
if !(hasInterface) exitWith {};
if (!hasInterface) exitWith {};
GVAR(flashbangPPEffectCC) = ppEffectCreate ["ColorCorrections", 4265];
GVAR(flashbangPPEffectCC) ppEffectForceInNVG true;

View File

@ -94,7 +94,7 @@ _affected = _grenade nearEntities ["CAManBase", 20];
}, [_light], 0.1] call EFUNC(common,waitAndExecute);
// blind player
if (_strength > 0.1) then {
if (_strength > 0.1 && hasInterface) then {
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) ppEffectCommit 0.01;

View File

@ -13,6 +13,7 @@
*/
#include "script_component.hpp"
if (!hasInterface) exitWith {};
params ["_huntIR"];
GVAR(huntIR) = _huntIR;

View File

@ -4,7 +4,7 @@
// 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);
if !(hasInterface) exitWith {};
if (!hasInterface) exitWith {};
GVAR(nearUnits) = [];

View File

@ -12,7 +12,7 @@
#include "script_component.hpp"
if !(hasInterface) exitWith {};
if (!hasInterface) exitWith {};
PARAMS_3(_logic,_units,_activated);

View File

@ -33,6 +33,8 @@ GVAR(heartBeatSounds_Slow) = ["ACE_heartbeat_slow_1", "ACE_heartbeat_slow_2"];
// Initialize all effects
if (hasInterface) then {
_fnc_createEffect = {
private "_effect";
params ["_type", "_layer", "_default"];
@ -241,7 +243,7 @@ GVAR(lastHeartBeatSound) = ACE_time;
};
}, 0, []] call CBA_fnc_addPerFrameHandler;
};
["SettingsInitialized", {
if (GVAR(level) == 2) exitwith {

View File

@ -21,6 +21,8 @@
*/
#include "script_component.hpp"
if (!hasInterface) exitWith {};
private ["_vehicle", "_weapon", "_ammo", "_magazine", "_player"];
_vehicle = _this select 0;

View File

@ -16,6 +16,7 @@
*/
#include "script_component.hpp"
if (!hasInterface) exitWith {};
private ["_brightness"];
PARAMS_2(_player,_changeInBrightness);

View File

@ -15,6 +15,8 @@
*/
#include "script_component.hpp"
if (!hasInterface) exitWith {};
private ["_currentVehicle", "_grainSetting", "_blurSetting", "_radBlurSetting", "_config", "_hmd", "_cameraView", "_turret"];
_currentVehicle = vehicle ACE_player;

View File

@ -1,7 +1,7 @@
// by esteldunedain
#include "script_component.hpp"
if !(hasInterface) exitWith {};
if (!hasInterface) exitWith {};
// Add keybinds
["ACE3 Weapons", QGVAR(unjamWeapon), localize LSTRING(UnjamWeapon),

View File

@ -1,7 +1,7 @@
// by esteldunedain
#include "script_component.hpp"
if !(hasInterface) exitWith {};
if (!hasInterface) exitWith {};
// Add keybinds
["ACE3 Weapons", QGVAR(checkAmmo), localize LSTRING(checkAmmo),

View File

@ -7,7 +7,7 @@
*/
#include "script_component.hpp"
if !(hasInterface) exitWith {};
if (!hasInterface) exitWith {};
// Check inventory when it changes
["playerInventoryChanged", {

View File

@ -1,7 +1,7 @@
#include "script_component.hpp"
// Exit on Headless
if !(hasInterface) exitWith {};
if (!hasInterface) exitWith {};
// Add interaction menu exception
["isNotSitting", {!((_this select 0) getVariable [QGVAR(isSitting), false])}] call EFUNC(common,addCanInteractWithCondition);

View File

@ -23,7 +23,7 @@
params [["_set",true,[true]]];
// Only clients can be spectators
if !(hasInterface) exitWith {};
if (!hasInterface) exitWith {};
// Exit if no change
if (_set isEqualTo GVAR(isSet)) exitwith {};

View File

@ -20,7 +20,7 @@
params [["_newUnits",[],[[]]],["_blacklist",false,[false]]];
// 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 !(_newUnits isEqualTo []) exitWith {

View File

@ -1,7 +1,7 @@
// by esteldunedain
#include "script_component.hpp"
if !(hasInterface) exitWith {};
if (!hasInterface) exitWith {};
// Add keybinds
["ACE3 Vehicles", QGVAR(speedLimiter), localize LSTRING(SpeedLimiter),

View File

@ -1,7 +1,7 @@
// by esteldunedain
#include "script_component.hpp"
if !(hasInterface) exitWith {};
if (!hasInterface) exitWith {};
// Add keybinds
["ACE3 Weapons", QGVAR(SelectPistolNew), localize LSTRING(SelectPistol),

View File

@ -1,6 +1,6 @@
#include "script_component.hpp"
if !(hasInterface) exitWith {};
if (!hasInterface) exitWith {};
GVAR(trackedBullets) = [];