From 514d21bdea30a48f537c035d71fce53fbb9cc127 Mon Sep 17 00:00:00 2001 From: icomrade Date: Thu, 27 Mar 2014 14:21:22 -0400 Subject: [PATCH] Remove Spawn, fix oversight --- SQF/dayz_code/system/BIS_Effects/init.sqf | 69 ++++++++++++----------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/SQF/dayz_code/system/BIS_Effects/init.sqf b/SQF/dayz_code/system/BIS_Effects/init.sqf index f353404a8..6a486880a 100644 --- a/SQF/dayz_code/system/BIS_Effects/init.sqf +++ b/SQF/dayz_code/system/BIS_Effects/init.sqf @@ -1,36 +1,39 @@ -[] spawn { - BIS_Effects_Init = true; //A2 won't overwrite this if var is not nil - diag_log "Res3tting B!S effects..."; - /* BIS_Effects_* fixes from Dwarden */ - BIS_Effects_Rifle = {false}; - BIS_Effects_EH_Fired = {false}; - BIS_Effects_EH_Killed = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\killed.sqf"; - BIS_Effects_AirDestruction = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestruction.sqf"; - BIS_Effects_AirDestructionStage2 = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestructionStage2.sqf"; - BIS_Effects_Secondaries = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\secondaries.sqf"; - - BIS_Effects_globalEvent = { - BIS_effects_gepv = _this; - publicVariable "BIS_effects_gepv"; - _this call BIS_Effects_startEvent; - }; - - BIS_Effects_startEvent = { - switch (_this select 0) do { - case "AirDestruction": { - [_this select 1] spawn BIS_Effects_AirDestruction; - }; - case "AirDestructionStage2": { - [_this select 1, _this select 2, _this select 3] spawn BIS_Effects_AirDestructionStage2; - }; - case "Burn": { - [_this select 1, _this select 2, _this select 3, false, true] spawn BIS_Effects_Burn; - }; +BIS_Effects_Init = true; //A2 won't overwrite this if var is not nil +/* BIS_Effects_* fixes from Dwarden */ +diag_log "Res3tting B!S effects..."; +BIS_Effects_EH_Fired = {false}; +BIS_Effects_EH_Killed = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\killed.sqf"; +BIS_Effects_Rifle = {false}; +BIS_Effects_Cannon=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\muzzle\cannon.sqf"; +BIS_Effects_HeavyCaliber=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\muzzle\heavycaliber.sqf"; +BIS_Effects_HeavySniper=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\muzzle\heavysniper.sqf"; +BIS_Effects_Rocket=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\muzzle\rocket.sqf"; +BIS_Effects_SmokeShell=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\muzzle\smokeshell.sqf"; +BIS_Effects_SmokeLauncher=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\muzzle\smokelauncher.sqf"; +BIS_Effects_Flares=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\muzzle\flares.sqf"; +BIS_Effects_Burn=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\destruction\burn.sqf"; +BIS_Effects_AircraftVapour=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\misc\aircraftvapour.sqf"; +BIS_Effects_AirDestruction = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestruction.sqf"; +BIS_Effects_AirDestructionStage2 = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestructionStage2.sqf"; +BIS_Effects_Secondaries = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\secondaries.sqf"; +BIS_Effects_globalEvent = { + BIS_effects_gepv = _this; + publicVariable "BIS_effects_gepv"; + _this call BIS_Effects_startEvent; +}; +BIS_Effects_startEvent = { + switch (_this select 0) do { + case "AirDestruction": { + [_this select 1] spawn BIS_Effects_AirDestruction; + }; + case "AirDestructionStage2": { + [_this select 1, _this select 2, _this select 3] spawn BIS_Effects_AirDestructionStage2; + }; + case "Burn": { + [_this select 1, _this select 2, _this select 3, false, true] spawn BIS_Effects_Burn; }; }; - - "BIS_effects_gepv" addPublicVariableEventHandler { - (_this select 1) call BIS_Effects_startEvent; - }; }; - +"BIS_effects_gepv" addPublicVariableEventHandler { + (_this select 1) call BIS_Effects_startEvent; +}; \ No newline at end of file