mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Using inline code instead of holdover function
This commit is contained in:
@ -6,7 +6,6 @@ PREP(bi_moduleCurator);
|
|||||||
PREP(bi_moduleMine);
|
PREP(bi_moduleMine);
|
||||||
PREP(bi_moduleProjectile);
|
PREP(bi_moduleProjectile);
|
||||||
PREP(bi_moduleRemoteControl);
|
PREP(bi_moduleRemoteControl);
|
||||||
PREP(moduleCuratorDelay);
|
|
||||||
PREP(moduleZeusSettings);
|
PREP(moduleZeusSettings);
|
||||||
|
|
||||||
ADDON = true;
|
ADDON = true;
|
||||||
|
@ -153,7 +153,19 @@ if (_activated) then {
|
|||||||
} foreach (_logic getvariable ["channels",[]]);
|
} foreach (_logic getvariable ["channels",[]]);
|
||||||
|
|
||||||
// Added by ACE_zeus to delay ascension message at mission start
|
// Added by ACE_zeus to delay ascension message at mission start
|
||||||
[DFUNC(moduleCuratorDelay),[_logic,1]] call EFUNC(common,execNextFrame);
|
[{
|
||||||
|
_logic = _this select 0;
|
||||||
|
_player = _this select 1;
|
||||||
|
|
||||||
|
if (GVAR(zeusAscension)) then {
|
||||||
|
//--- Sent notification to all assigned players
|
||||||
|
{
|
||||||
|
if (isplayer _x) then {
|
||||||
|
[["CuratorAssign",[_name,name _player]],"bis_fnc_showNotification",_x] call bis_fnc_mp;
|
||||||
|
};
|
||||||
|
} foreach (curatoreditableobjects _logic);
|
||||||
|
};
|
||||||
|
},[_logic,_player]] call EFUNC(common,execNextFrame);
|
||||||
|
|
||||||
[_logic,"curatorUnitAssigned",[_logic,_player]] call bis_fnc_callscriptedeventhandler;
|
[_logic,"curatorUnitAssigned",[_logic,_player]] call bis_fnc_callscriptedeventhandler;
|
||||||
|
|
||||||
@ -201,7 +213,28 @@ if (_activated) then {
|
|||||||
_addons call bis_fnc_activateaddons;
|
_addons call bis_fnc_activateaddons;
|
||||||
|
|
||||||
// Added by ACE_zeus to delay bird code
|
// Added by ACE_zeus to delay bird code
|
||||||
[DFUNC(moduleCuratorDelay),[_logic,0]] call EFUNC(common,execNextFrame);
|
[{
|
||||||
|
_logic = _this select 0;
|
||||||
|
|
||||||
|
if (GVAR(zeusBird)) then {
|
||||||
|
//--- Create bird
|
||||||
|
_birdType = _logic getvariable ["birdType","eagle_f"];
|
||||||
|
if (_birdType != "") then {
|
||||||
|
_bird = createvehicle [_birdType,[100,100,100],[],0,"none"];
|
||||||
|
_logic setvariable ["bird",_bird,true];
|
||||||
|
};
|
||||||
|
|
||||||
|
//--- Locality changed
|
||||||
|
_logic addeventhandler [
|
||||||
|
"local",
|
||||||
|
{
|
||||||
|
_logic = _this select 0;
|
||||||
|
_bird = _logic getvariable ["bird",objnull];
|
||||||
|
_bird setowner owner _logic;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
},[_logic]] call EFUNC(common,execNextFrame);
|
||||||
};
|
};
|
||||||
|
|
||||||
//--- Player
|
//--- Player
|
||||||
|
@ -1,58 +0,0 @@
|
|||||||
/*
|
|
||||||
* Author: SilentSpike
|
|
||||||
* Function executed at a delay to allow curator settings module to run first
|
|
||||||
* Allows ascension and bird settings to be set by module beforehand
|
|
||||||
*
|
|
||||||
* Arguments:
|
|
||||||
* 0: The module logic <LOGIC>
|
|
||||||
* 1: Mode <NUMBER>
|
|
||||||
* 0 - Spawn bird
|
|
||||||
* 1 - Ascension message
|
|
||||||
*
|
|
||||||
* Return Value:
|
|
||||||
* None <NIL>
|
|
||||||
*
|
|
||||||
* Public: No
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "script_component.hpp"
|
|
||||||
|
|
||||||
if (isServer) then {
|
|
||||||
private ["_logic","_mode","_player","_birdType","_bird"];
|
|
||||||
|
|
||||||
_logic = _this select 0;
|
|
||||||
_mode = _this select 1;
|
|
||||||
|
|
||||||
if (_mode == 1) then {
|
|
||||||
// Extracted from moduleCurator to toggle ascension messages
|
|
||||||
_player = getAssignedCuratorUnit _logic;
|
|
||||||
if (GVAR(zeusAscension)) then {
|
|
||||||
//--- Sent notification to all assigned players
|
|
||||||
{
|
|
||||||
if (isplayer _x) then {
|
|
||||||
[["CuratorAssign",[_name,name _player]],"bis_fnc_showNotification",_x] call bis_fnc_mp;
|
|
||||||
};
|
|
||||||
} foreach (curatoreditableobjects _logic);
|
|
||||||
};
|
|
||||||
} else {
|
|
||||||
// Extracted from moduleCurator to toggle eagle
|
|
||||||
if (GVAR(zeusBird)) then {
|
|
||||||
//--- Create bird
|
|
||||||
_birdType = _logic getvariable ["birdType","eagle_f"];
|
|
||||||
if (_birdType != "") then {
|
|
||||||
_bird = createvehicle [_birdType,[100,100,100],[],0,"none"];
|
|
||||||
_logic setvariable ["bird",_bird,true];
|
|
||||||
};
|
|
||||||
|
|
||||||
//--- Locality changed
|
|
||||||
_logic addeventhandler [
|
|
||||||
"local",
|
|
||||||
{
|
|
||||||
_logic = _this select 0;
|
|
||||||
_bird = _logic getvariable ["bird",objnull];
|
|
||||||
_bird setowner owner _logic;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
Reference in New Issue
Block a user