17th-Ranger-Battalion-ORG/MissionTemplate
6
0
Fork 0
Code Issues 1 Pull Requests Actions Projects 1 Releases 16 Wiki Activity

adds default bases + allows mms to set custom waypoints for microdagr #26

Merged
hizumi merged 3 commits from add-microdagr-waypoints into develop 2024-02-14 01:53:10 -06:00
Conversation 2 Commits 3 Files Changed 11 +30 -8
4 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9f89ec12d5 - Show all commits

4
framework/CfgFunctions.hpp
View File

@@ -26,7 +26,6 @@ class DOUBLES(PREFIX,client) {
class initClient {};
class addMicroDAGRWaypoints {};
class addZenModules {};
IndigoFox marked this conversation as resolved
hizumi commented 2024-02-13 02:22:21 -06:00
Review
Copy Link

regression introduced here with bindEmptyGroupGarbageCleanup on my part due to naming convention.
postInit = 1 was to allow running on all machine, as technically the server is a client; needs to be executed on both clients and server for due to locality issues on failed ownership transfers

regression introduced here with bindEmptyGroupGarbageCleanup on my part due to naming convention. postInit = 1 was to allow running on all machine, as technically the server is a client; needs to be executed on both clients and server for due to locality issues on failed ownership transfers
IndigoFox commented 2024-02-14 01:14:14 -06:00
Review
Copy Link

moved to performance module and is now managed with global setting & removal/reapply on setting change

moved to performance module and is now managed with global setting & removal/reapply on setting change
class bindEmptyGroupGarbageCleanup {};
class bindEventHandlers {};
class bindVehicleActions {};
};
@@ -106,13 +105,14 @@ class DOUBLES(PREFIX,performance) {
class functions {
file = "framework\performance\functions";
class addCBASettings {preInit=1;};
class addDNI_PlayerFPS { postInit = 1; };
class addDNI_PlayerFPS {postInit = 1;};
// PFHs managed in addCBASettings onChange code
class addClientStatsPFH {};
class calculateClientStats {};
class addServerStatsPFH {};
class calculateServerStats {};
class addEmptyGroupCleanupPFH {};
};
};

1
framework/client/functions/fn_initClient.sqf
View File

@@ -5,7 +5,6 @@ if (!hasInterface) exitWith {};
call FUNC(addMicroDAGRWaypoints);
call FUNC(addZenModules);
call FUNC(bindEmptyGroupGarbageCleanup);
call FUNC(bindEventHandlers);
call FUNC(bindVehicleActions);

22
framework/performance/functions/fn_addCBASettings.sqf
View File

@@ -1,5 +1,27 @@
#include "..\script_component.hpp"
[
QGVAR(emptyGroupCleanup_enable),
"CHECKBOX",
"Empty Group Cleanup Enabled",
[QUOTE(SETTINGS_GROUP_NAME), QUOTE(COMPONENT_BEAUTIFIED)],
true,
true,
{
params ["_value"];
[
QGVAR(emptyGroupCleanup_enable),
_value
] call EFUNC(common,logSettingChanged);
if (!isNull (missionNamespace getVariable [QGVAR(emptyGroupCleanupPFH), locationNull])) then {
deleteLocation GVAR(emptyGroupCleanupPFH);
};
call FUNC(addEmptyGroupCleanupPFH);
}
] call CBA_fnc_addSetting;
//---------------------
// Server CPS
//---------------------

11
framework/client/functions/fn_bindEmptyGroupGarbageCleanup.sqf → framework/performance/functions/fn_addEmptyGroupCleanupPFH.sqf
View File

@@ -7,7 +7,7 @@
[]
] call EFUNC(common,log);
_emptyGroupPFH = [
GVAR(emptyGroupCleanupPFH) = [
{
{
if (local _x) then {
@@ -19,7 +19,7 @@ _emptyGroupPFH = [
},
300,
[],
{
{ // on creation
[
LEVEL_INFO,
QUOTE(COMPONENT),
@@ -27,15 +27,16 @@ _emptyGroupPFH = [
[]
] call EFUNC(common,log);
},
{ [
{ // on deletion
[
LEVEL_INFO,
QUOTE(COMPONENT),
"Empty group deletion PFH unloaded",
[]
] call EFUNC(common,log);
},
{ true },
{ false },
{ (missionNamespace getVariable [QGVAR(emptyGroupCleanup_enable), false]) },
{ not (missionNamespace getVariable [QGVAR(emptyGroupCleanup_enable), false]) },
[]
] call CBA_fnc_createPerFrameHandlerObject;