Skip to content

feat: add variable name exclusion for objects #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fank merged 2 commits into from
Aug 1, 2026
Merged

feat: add variable name exclusion for objects #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbfdb5e
feat: add variable name exclusion for objects
fank Jul 10, 2026
e9cbb81
fix(recorder): harden variable name exclusion
fank Aug 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions addons/recorder/XEH_preInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,33 @@ GVAR(allSettings) = [
false // requires restart to apply
],

/*
CBA Setting: OCAP_settings_excludeVarNameFromRecord
Description:
Array of editor variable names (vehicleVarName). Any unit or vehicle whose variable name matches will be excluded from recording. Matching is case-insensitive. Use single quotes! Default: []

Setting Name:
Variable Names to Exclude

Value Type:
Stringified Array

Example:
> "['hideout_1','cache_west']"
*/
[
QEGVAR(settings,excludeVarNameFromRecord),
"EDITBOX", // setting type
[
"Variable Names to Exclude", // Pretty name shown inside the ingame settings menu. Can be stringtable entry.
"Array of editor variable names (vehicleVarName) to exclude from recording. Case-insensitive. Use single quotes! Default: []"
],
[COMPONENT_NAME, "Exclusions"], // Pretty name of the category where the setting can be found. Can be stringtable entry.
"[]", // default string value
true, // "_isGlobal" flag. Set this to true to always have this setting synchronized between all clients in multiplayer
{}, // function that will be executed once on mission start and every time the setting is changed.
false // requires restart to apply
],

// Section: Extra Tracking

Expand Down
26 changes: 22 additions & 4 deletions addons/recorder/fnc_captureLoop.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,16 @@ GVAR(PFHObject) = [
{
private _justInitialized = false;
if !(_x getVariable [QGVARMAIN(isInitialized), false]) then {
if (
_x isKindOf "Logic"
) exitWith {
if (_x isKindOf "Logic") exitWith {
_x setVariable [QGVARMAIN(exclude), true, true];
_x setVariable [QGVARMAIN(isInitialized), true, true];
};
// Check pre-set OCAP_main_exclude variable for per-object exclusion via editor init field
if (_x getVariable [QGVARMAIN(exclude), false]) exitWith {
_x setVariable [QGVARMAIN(isInitialized), true, true];
};
Comment on lines +97 to +99

@gemini-code-assist gemini-code-assist Bot Jul 10, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

Exiting early here for excluded units without sending the :SOLDIER:CREATE: event introduces a critical bug when players are involved.

OCAP's design forces player units to always be tracked (lines 135-139 un-exclude any unit where isPlayer _x is true). If a player unit (or a playable AI unit that a player slots into later) is excluded at initialization, it will be marked as isInitialized = true but :SOLDIER:CREATE: will never be sent. When the player is un-excluded, OCAP will start sending :SOLDIER:STATE: updates for an ID that was never created, leading to database errors or broken AAR playbacks.

To fix this:

  1. Ensure player units are never excluded during initialization by adding !isPlayer _x to the exclusion checks.
  2. For playable AI units that players slot into later, reset isInitialized to false when they are un-excluded so they can be properly initialized on the next frame.

Since lines 135-139 are outside this diff hunk, you should update them manually as follows:

private _isExcluded = _x getVariable [QGVARMAIN(exclude), false];
if (_isExcluded && {isPlayer _x}) then {
  _x setVariable [QGVARMAIN(exclude), false];
  _x setVariable [QGVARMAIN(isInitialized), false, true];
  _isExcluded = true; // Keep it excluded for this frame until initialized on the next frame
};
        if (!isPlayer _x && {_x getVariable [QGVARMAIN(exclude), false]}) exitWith {
          _x setVariable [QGVARMAIN(isInitialized), true, true];
        };

// Check vehicleVarName against centralized exclude list
if (GVAR(excludeVarNameList) isNotEqualTo [] && {toLower (vehicleVarName _x) in GVAR(excludeVarNameList)}) exitWith {
_x setVariable [QGVARMAIN(exclude), true, true];
_x setVariable [QGVARMAIN(isInitialized), true, true];
};
Expand Down Expand Up @@ -126,7 +133,9 @@ GVAR(PFHObject) = [
};
// Re-include units that have become player-controlled again (e.g., reconnected players)
private _isExcluded = _x getVariable [QGVARMAIN(exclude), false];
if (_isExcluded && {isPlayer _x}) then {
// Only units that were actually recorded (have an ID) may be re-included, otherwise
// an intentionally excluded playable unit would be reported without ever being created.
if (_isExcluded && {isPlayer _x} && {(_x getVariable [QGVARMAIN(id), -1]) > -1}) then {
_x setVariable [QGVARMAIN(exclude), false];
_isExcluded = false;
};
Expand Down Expand Up @@ -204,6 +213,15 @@ GVAR(PFHObject) = [
{
private _justInitialized = false;
if !(_x getVariable [QGVARMAIN(isInitialized), false]) then {
// Check pre-set OCAP_main_exclude variable for per-object exclusion via editor init field
if (_x getVariable [QGVARMAIN(exclude), false]) exitWith {
_x setVariable [QGVARMAIN(isInitialized), true, true];
};
// Check vehicleVarName against centralized exclude list
if (GVAR(excludeVarNameList) isNotEqualTo [] && {toLower (vehicleVarName _x) in GVAR(excludeVarNameList)}) exitWith {
_x setVariable [QGVARMAIN(exclude), true, true];
_x setVariable [QGVARMAIN(isInitialized), true, true];
};
_vehType = typeOf _x;
_class = _vehType call FUNC(getClass);
private _vic = _x;
Expand Down
8 changes: 8 additions & 0 deletions addons/recorder/fnc_init.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,14 @@ GVAR(excludeMarkerList) = if (!isNil QEGVAR(settings,excludeMarkerFromRecord)) t
[]
};

// Lowercased once here so lookups in the capture loop can be case-insensitive,
// matching how class/kind exclusions behave.
GVAR(excludeVarNameList) = if (!isNil QEGVAR(settings,excludeVarNameFromRecord)) then {
(parseSimpleArray EGVAR(settings,excludeVarNameFromRecord)) apply {toLower _x}
} else {
[]
};

INFO_4("Settings snapshot — frameCaptureDelay: %1 | autoStart: %2 | minPlayerCount: %3 | minMissionTime: %4",GVAR(frameCaptureDelay),GVAR(autoStart),EGVAR(settings,minPlayerCount),GVAR(minMissionTime));

GVAR(hasACEIsAwake) = !isNil "ace_common_fnc_isAwake";
Expand Down