mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Let this finally fix it please
This commit is contained in:
parent
b2c672e6c7
commit
c6f6e4e9f7
@ -40,10 +40,10 @@ GVAR(CurrentSpeedDial) = 0;
|
|||||||
// placed mine.
|
// placed mine.
|
||||||
if (isServer) then {
|
if (isServer) then {
|
||||||
["clientRequestsOrientation", {
|
["clientRequestsOrientation", {
|
||||||
params ["_group"];
|
params ["_logic"];
|
||||||
TRACE_1("clientRequestsOrientations received:",_group);
|
TRACE_1("clientRequestsOrientations received:",_logic);
|
||||||
TRACE_2("serverSendsOrientations sent:",GVAR(explosivesOrientations));
|
TRACE_2("serverSendsOrientations sent:",GVAR(explosivesOrientations));
|
||||||
["serverSendsOrientations", _group, GVAR(explosivesOrientations)] call EFUNC(common,targetEvent);
|
["serverSendsOrientations", _logic, GVAR(explosivesOrientations)] call EFUNC(common,targetEvent);
|
||||||
}] call EFUNC(common,addEventHandler);
|
}] call EFUNC(common,addEventHandler);
|
||||||
} else {
|
} else {
|
||||||
["serverSendsOrientations", {
|
["serverSendsOrientations", {
|
||||||
@ -53,17 +53,16 @@ if (isServer) then {
|
|||||||
params ["_explosive","_direction","_pitch"];
|
params ["_explosive","_direction","_pitch"];
|
||||||
[_explosive, _direction, _pitch] call FUNC(setPosition);
|
[_explosive, _direction, _pitch] call FUNC(setPosition);
|
||||||
} forEach _explosivesOrientations;
|
} forEach _explosivesOrientations;
|
||||||
deleteGroup GVAR(localGroup);
|
private _group = group GVAR(localLogic);
|
||||||
GVAR(localGroup) = nil;
|
|
||||||
deleteVehicle GVAR(localLogic);
|
deleteVehicle GVAR(localLogic);
|
||||||
GVAR(localLogic) = nil;
|
GVAR(localLogic) = nil;
|
||||||
|
deleteGroup _group;
|
||||||
}] call EFUNC(common,addEventHandler);
|
}] call EFUNC(common,addEventHandler);
|
||||||
|
|
||||||
// Create a logic to get the client ID
|
// Create a logic to get the client ID
|
||||||
GVAR(localLogic) = sideLogic createUnit ["Logic", [0,0,0], [], 0, "NONE"];
|
GVAR(localLogic) = (createGroup sideLogic) createUnit ["Logic", [0,0,0], [], 0, "NONE"];
|
||||||
GVAR(localGroup) = createGroup GVAR(localLogic);
|
|
||||||
TRACE_1("clientRequestsOrientations sent:",GVAR(localGroup));
|
TRACE_1("clientRequestsOrientations sent:",GVAR(localGroup));
|
||||||
["clientRequestsOrientations", [GVAR(localGroup)]] call EFUNC(common,serverEvent);
|
["clientRequestsOrientations", [GVAR(localLogic)]] call EFUNC(common,serverEvent);
|
||||||
};
|
};
|
||||||
|
|
||||||
["interactMenuOpened", {
|
["interactMenuOpened", {
|
||||||
|
@ -9,8 +9,7 @@
|
|||||||
|
|
||||||
// request marker data for JIP
|
// request marker data for JIP
|
||||||
if (isMultiplayer && {!isServer} && {hasInterface}) then {
|
if (isMultiplayer && {!isServer} && {hasInterface}) then {
|
||||||
GVAR(localLogic) = sideLogic createUnit ["Logic", [0,0,0], [], 0, "NONE"];
|
GVAR(localLogic) = (createGroup sideLogic) createUnit ["Logic", [0,0,0], [], 0, "NONE"];
|
||||||
GVAR(localGroup) = createGroup GVAR(localLogic);
|
|
||||||
[QGVAR(sendMarkersJIP), [GVAR(localLogic)]] call EFUNC(common,serverEvent);
|
[QGVAR(sendMarkersJIP), [GVAR(localLogic)]] call EFUNC(common,serverEvent);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ TRACE_3("params",_allMapMarkers,_allMapMarkersProperties);
|
|||||||
false
|
false
|
||||||
} count allMapMarkers;
|
} count allMapMarkers;
|
||||||
|
|
||||||
deleteGroup GVAR(localGroup);
|
private _group = group GVAR(localLogic);
|
||||||
GVAR(localGroup) = nil;
|
|
||||||
deleteVehicle GVAR(localLogic);
|
deleteVehicle GVAR(localLogic);
|
||||||
GVAR(localLogic) = nil;
|
GVAR(localLogic) = nil;
|
||||||
|
deleteGroup _group;
|
||||||
|
Loading…
Reference in New Issue
Block a user