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

FCS - Fix not working in MP (#7675)

Browse Source 
also fix TRACE_10 macro
This commit is contained in:
PabstMirror 2020-05-07 11:28:32 -05:00 committed by GitHub
parent 64de0388c7
commit 7311e644a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/fcs/XEH_postInit.sqf
View File

@ -18,6 +18,12 @@ if (!hasInterface) exitWith {};
// Register event for global updates
[QGVAR(forceUpdate), {[ACE_player] call FUNC(onForceUpdate)}] call CBA_fnc_addEventHandler;
[QGVAR(addFiredEH), {
TRACE_1("Adding firedEH",_this);
["ace_firedPlayerVehicle", LINKFUNC(firedEH)] call CBA_fnc_addEventHandler;
["ace_firedPlayerVehicleNonLocal", LINKFUNC(firedEH)] call CBA_fnc_addEventHandler;
}] call CBA_fnc_addEventHandler;
#ifdef DEBUG_MODE_FULL
call compile preprocessFileLineNumbers QPATHTOF(dev\test_debugConfigs.sqf);
#endif

11
addons/fcs/functions/fnc_vehicleInit.sqf
View File

@ -21,11 +21,9 @@ params ["_vehicle"];
private _turretConfig = [configFile >> "CfgVehicles" >> typeOf _vehicle, _x] call EFUNC(common,getTurretConfigPath);
if (getNumber (_turretConfig >> QGVAR(Enabled)) == 1) then {
if (missionNamespace getVariable [QGVAR(needToAddFiredEH), true]) then {
["ace_firedPlayerVehicle", LINKFUNC(firedEH)] call CBA_fnc_addEventHandler;
["ace_firedPlayerVehicleNonLocal", LINKFUNC(firedEH)] call CBA_fnc_addEventHandler;
GVAR(needToAddFiredEH) = false;
TRACE_1("Registered fired event handlers for all vehicles",GVAR(needToAddFiredEH));
if (isNil QGVAR(jipID)) then {
GVAR(jipID) = [QGVAR(addFiredEH), [], QGVAR(addFiredEH)] call CBA_fnc_globalEventJIP;
TRACE_1("Adding fired EH for players",GVAR(jipID));
};
_vehicle setVariable [format ["%1_%2", QGVAR(Distance), _x], 0, true];
@ -48,5 +46,4 @@ params ["_vehicle"];
_vehicle setVariable [format ["%1_%2", QGVAR(ViewDiff), _x], 0, true];
};
};
false
} count allTurrets _vehicle;
} forEach allTurrets _vehicle;

3
addons/main/script_macros.hpp
View File

@ -115,8 +115,7 @@
#define PFORMAT_10(MESSAGE,A,B,C,D,E,F,G,H,I,J) \
format ['%1: A=%2, B=%3, C=%4, D=%5, E=%6, F=%7, G=%8, H=%9, I=%10 J=%11', MESSAGE, RETNIL(A), RETNIL(B), RETNIL(C), RETNIL(D), RETNIL(E), RETNIL(F), RETNIL(G), RETNIL(H), RETNIL(I), RETNIL(J)]
#ifdef DEBUG_MODE_FULL
#define TRACE_10(MESSAGE,A,B,C,D,E,F,G,H,I,J) \
[THIS_FILE_, __LINE__, PFORMAT_10(MESSAGE,A,B,C,D,E,F,G,H,I,J)] call CBA_fnc_log
#define TRACE_10(MESSAGE,A,B,C,D,E,F,G,H,I,J) LOG_SYS_FILELINENUMBERS('TRACE',PFORMAT_10(str diag_frameNo + ' ' + (MESSAGE),A,B,C,D,E,F,G,H,I,J))
#else
#define TRACE_10(MESSAGE,A,B,C,D,E,F,G,H,I,J) /* disabled */
#endif