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

fix waitUntil capitalization

Browse Source
This commit is contained in:
commy2 2015-11-30 17:28:01 +01:00
parent a9ebcf8543
commit e422388484
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/common/functions/fnc_receiveRequest.sqf
View File

@ -53,7 +53,7 @@ GVAR(RECIEVE_REQUEST_TIME_OUT_SCRIPT) = [ACE_time, _target, _requestID] spawn {
private "_id"; private "_id";
_id = _target getVariable _requestID; _id = _target getVariable _requestID;
waituntil { waitUntil {
_id = _target getVariable _requestID; _id = _target getVariable _requestID;
(ACE_time > _time || isNil "_id") (ACE_time > _time || isNil "_id")

4
addons/optics/XEH_postInit.sqf
View File

@ -6,8 +6,8 @@ if (!hasInterface) exitWith {};
GVAR(camera) = objNull; GVAR(camera) = objNull;
0 = 0 spawn { 0 = 0 spawn {
waituntil {!isNull ACE_player}; waitUntil {!isNull ACE_player};
waituntil {sleep 1; {_x != GVAR(camera)} count allMissionObjects "camera" == 0 && {isNull curatorCamera}}; waitUntil {sleep 1; {_x != GVAR(camera)} count allMissionObjects "camera" == 0 && {isNull curatorCamera}};
GVAR(camera) cameraEffect ["TERMINATE", "BACK"]; GVAR(camera) cameraEffect ["TERMINATE", "BACK"];
camDestroy GVAR(camera); camDestroy GVAR(camera);

24
addons/zeus/functions/fnc_bi_moduleCurator.sqf
View File

@ -113,7 +113,7 @@ if (_activated) then {
if (_name == "") then {_name = localize "STR_A3_curator";}; if (_name == "") then {_name = localize "STR_A3_curator";};
//--- Wait until mission starts //--- Wait until mission starts
waituntil {time > 0}; // NOTE: DO NOT CHANGE TO ACE_TIME, IT BREAKS THE MODULE waitUntil {time > 0}; // NOTE: DO NOT CHANGE TO ACE_TIME, IT BREAKS THE MODULE
//--- Refresh addon list, so it's broadcasted to clients //--- Refresh addon list, so it's broadcasted to clients
_addons = curatoraddons _logic; _addons = curatoraddons _logic;
@ -124,13 +124,13 @@ if (_activated) then {
//--- Wait for player to become Zeus //--- Wait for player to become Zeus
switch true do { switch true do {
case (_ownerUID > 0): { case (_ownerUID > 0): {
waituntil { waitUntil {
sleep 0.01; sleep 0.01;
{getplayeruid _x == _ownerVar} count playableunits > 0 || isnull _logic {getplayeruid _x == _ownerVar} count playableunits > 0 || isnull _logic
}; };
}; };
default { default {
waituntil {isplayer (missionnamespace getVariable [_ownerVar,objnull]) || isnull _logic}; waitUntil {isplayer (missionnamespace getVariable [_ownerVar,objnull]) || isnull _logic};
}; };
}; };
if (isnull _logic) exitWith {}; if (isnull _logic) exitWith {};
@ -148,8 +148,8 @@ if (_activated) then {
}; };
}; };
waituntil {unassigncurator _logic; isnull (getassignedcuratorunit _logic) || isnull _logic}; waitUntil {unassigncurator _logic; isnull (getassignedcuratorunit _logic) || isnull _logic};
waituntil {_player assignCurator _logic; getassignedcuratorunit _logic == _player || isnull _logic}; waitUntil {_player assignCurator _logic; getassignedcuratorunit _logic == _player || isnull _logic};
if (isnull _logic) exitWith {}; if (isnull _logic) exitWith {};
//--- Add radio channels //--- Add radio channels
@ -185,13 +185,13 @@ if (_activated) then {
//--- Wait for player to stop being Zeus //--- Wait for player to stop being Zeus
switch true do { switch true do {
case (_ownerUID > 0): { case (_ownerUID > 0): {
waituntil { waitUntil {
sleep 0.01; sleep 0.01;
{getplayeruid _x == _ownerVar} count playableunits == 0 || isnull _logic {getplayeruid _x == _ownerVar} count playableunits == 0 || isnull _logic
}; };
}; };
default { default {
waituntil {_player != missionnamespace getVariable [_ownerVar,objnull] || isnull _logic}; waitUntil {_player != missionnamespace getVariable [_ownerVar,objnull] || isnull _logic};
}; };
}; };
if (isnull _logic) exitWith {}; if (isnull _logic) exitWith {};
@ -202,7 +202,7 @@ if (_activated) then {
} forEach (_logic getVariable ["channels",[]]); } forEach (_logic getVariable ["channels",[]]);
//--- Unassign //--- Unassign
waituntil {unassigncurator _logic; isnull (getassignedcuratorunit _logic) || isnull _logic}; waitUntil {unassigncurator _logic; isnull (getassignedcuratorunit _logic) || isnull _logic};
if (isnull _logic) exitWith {}; if (isnull _logic) exitWith {};
}; };
}; };
@ -249,7 +249,7 @@ if (_activated) then {
//--- Player //--- Player
if (hasinterface) then { if (hasinterface) then {
waituntil {local player}; waitUntil {local player};
_serverCommand = if (_ownerVar == "#adminLogged") then {"#shutdown"} else {"#kick"}; _serverCommand = if (_ownerVar == "#adminLogged") then {"#shutdown"} else {"#kick"};
//--- Black effect until the interface is open //--- Black effect until the interface is open
@ -288,12 +288,12 @@ if (_activated) then {
_adminVar = _this select 1; _adminVar = _this select 1;
_serverCommand = _this select 2; _serverCommand = _this select 2;
while {true} do { while {true} do {
waituntil {sleep 0.1; servercommandavailable _serverCommand}; waitUntil {sleep 0.1; servercommandavailable _serverCommand};
missionnamespace setVariable [_adminVar,player]; missionnamespace setVariable [_adminVar,player];
publicvariable _adminVar; publicvariable _adminVar;
_respawn = player addeventhandler ["respawn",format ["%1 = _this select 0; publicvariable '%1';",_adminVar]]; _respawn = player addeventhandler ["respawn",format ["%1 = _this select 0; publicvariable '%1';",_adminVar]];
waituntil {sleep 0.1; !servercommandavailable _serverCommand}; waitUntil {sleep 0.1; !servercommandavailable _serverCommand};
missionnamespace setVariable [_adminVar,objnull]; missionnamespace setVariable [_adminVar,objnull];
publicvariable _adminVar; publicvariable _adminVar;
player removeeventhandler ["respawn",_respawn]; player removeeventhandler ["respawn",_respawn];
@ -305,7 +305,7 @@ if (_activated) then {
[_logic] spawn { [_logic] spawn {
_logic = _this select 0; _logic = _this select 0;
sleep 1; sleep 1;
waituntil {alive player}; waitUntil {alive player};
//--- Show warning when Zeus key is not assigned //--- Show warning when Zeus key is not assigned
if (count (actionkeys "curatorInterface") == 0) then { if (count (actionkeys "curatorInterface") == 0) then {

2
addons/zeus/functions/fnc_bi_moduleMine.sqf
View File

@ -43,7 +43,7 @@ if (_activated) then {
//--- Show hint to curator who placed the object //--- Show hint to curator who placed the object
[[["Curator","PlaceMines"],nil,nil,nil,nil,nil,nil,true],"bis_fnc_advHint",_logic] call bis_fnc_mp; [[["Curator","PlaceMines"],nil,nil,nil,nil,nil,nil,true],"bis_fnc_advHint",_logic] call bis_fnc_mp;
waituntil {sleep 0.1; isnull _explosive || isnull _logic || !alive _logic}; waitUntil {sleep 0.1; isnull _explosive || isnull _logic || !alive _logic};
if (isnull _logic) then {deletevehicle _explosive;} else {_explosive setdamage 1;}; if (isnull _logic) then {deletevehicle _explosive;} else {_explosive setdamage 1;};
deletevehicle _logic; deletevehicle _logic;
}; };

4
addons/zeus/functions/fnc_bi_moduleProjectile.sqf
View File

@ -146,13 +146,13 @@ if (_activated) then {
//--- Update //--- Update
if (_attach) then { if (_attach) then {
waituntil { waitUntil {
_soundSource setposatl getposatl _projectile; _soundSource setposatl getposatl _projectile;
sleep 1; sleep 1;
isnull _projectile || isnull _logic isnull _projectile || isnull _logic
}; };
} else { } else {
waituntil { waitUntil {
_soundSource setposatl getposatl _projectile; _soundSource setposatl getposatl _projectile;
if (getposatl _logic distance _pos > 0 || direction _logic != _dir) then { if (getposatl _logic distance _pos > 0 || direction _logic != _dir) then {

6
addons/zeus/functions/fnc_bi_moduleRemoteControl.sqf
View File

@ -76,7 +76,7 @@ if (_activated && local _logic && !isnull curatorcamera) then {
//--- Wait for interface to close //--- Wait for interface to close
(finddisplay 312) closedisplay 2; (finddisplay 312) closedisplay 2;
waituntil {isnull curatorcamera}; waitUntil {isnull curatorcamera};
//--- Switch //--- Switch
player remotecontrol _unit; player remotecontrol _unit;
@ -106,7 +106,7 @@ if (_activated && local _logic && !isnull curatorcamera) then {
_vehicle = vehicle _unit; _vehicle = vehicle _unit;
_vehicleRole = str assignedvehiclerole _unit; _vehicleRole = str assignedvehiclerole _unit;
_rating = rating player; _rating = rating player;
waituntil { waitUntil {
//--- Refresh when vehicle or vehicle role changes //--- Refresh when vehicle or vehicle role changes
if ((vehicle _unit != _vehicle || str assignedvehiclerole _unit != _vehicleRole) && {alive _unit}) then { if ((vehicle _unit != _vehicle || str assignedvehiclerole _unit != _vehicleRole) && {alive _unit}) then {
player remotecontrol _unit; player remotecontrol _unit;
@ -159,7 +159,7 @@ if (_activated && local _logic && !isnull curatorcamera) then {
opencuratorinterface; opencuratorinterface;
ppeffectdestroy _color; ppeffectdestroy _color;
waituntil {!isnull curatorcamera}; waitUntil {!isnull curatorcamera};
player switchcamera cameraview; player switchcamera cameraview;
bis_fnc_moduleRemoteControl_unit = nil; bis_fnc_moduleRemoteControl_unit = nil;
("bis_fnc_moduleRemoteCurator" call bis_fnc_rscLayer) cuttext ["","black in",1]; ("bis_fnc_moduleRemoteCurator" call bis_fnc_rscLayer) cuttext ["","black in",1];