Skip to content

Loot - Fix searchable positioning checks #289

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
Mike-MF merged 1 commit into from
Jul 4, 2026
Merged

Loot - Fix searchable positioning checks #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 5 additions & 7 deletions addons/loot/functions/fnc_cacheSearched.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Caches searched object position to array
*
* Arguments:
* 0: Object <OBJECT>
* 0: Position <ARRAY>
*
* Return Value:
* None
Expand All @@ -14,16 +14,14 @@
*
*/

params ["_object"];
params ["_position"];

private _position = getPosWorld _object;

// Check if position is already cached (within 0.4 meters)
if (GVAR(searchedPositions) findIf {_x distance _position < 0.4} isEqualTo -1) then {
// Check if position is already cached (within 0.5 meters)
if (GVAR(searchedPositions) findIf {_x vectorDistance _position < 0.5} isEqualTo -1) then {

GVAR(searchedPositions) pushBack _position;

publicVariable QGVAR(searchedPositions);

[QUOTE(COMPONENT_BEAUTIFIED), format ["Cached searched position %1 for object %2", _position, _object]] call EFUNC(common,debugMessage);
[QUOTE(COMPONENT_BEAUTIFIED), format ["Cached searched position %1", _position]] call EFUNC(common,debugMessage);
};
8 changes: 5 additions & 3 deletions addons/loot/functions/fnc_searchInteraction.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,14 @@
QPATHTOEF(icons,data\scan_search_ca.paa),
{
params ["", "", "_params"];
_params params ["_realObject", "_objectData"];
[_realObject, _objectData] call FUNC(searchObject);
_params params ["_realObject", "_objectData", "_hitPos"];
[_realObject, _objectData, _hitPos] call FUNC(searchObject);
},
{true},
{},
[_object, _objectData]
[_object, _objectData, _hitPos],
[0, 0, 0],
3
] call ACEFUNC(interact_menu,createAction);

[GVAR(activeLogic), 0, [], _action] call ACEFUNC(interact_menu,addActionToObject);
Expand Down
16 changes: 8 additions & 8 deletions addons/loot/functions/fnc_searchObject.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* Arguments:
* 0: Object <OBJECT>
* 1: Object data <ARRAY>
* 2: Hit Position <ARRAY>
*
* Return Value:
* None
Expand All @@ -15,7 +16,7 @@
*
*/

params ["_object", "_objectData"];
params ["_object", "_objectData", "_hitPos"];

if (isNull _object) exitWith {};

Expand All @@ -28,8 +29,7 @@ private _magazines = _objectData select 6;
private _items = _objectData select 7;
private _backpacks = _objectData select 8;

private _pos = getPosWorld _object;
if (GVAR(searchedPositions) findIf {_x distance _pos < 0.4} isNotEqualTo -1) exitWith {
if (GVAR(searchedPositions) findIf {_x vectorDistance _hitPos < 0.5} isNotEqualTo -1) exitWith {
[QEGVAR(common,tileText), localize LSTRING(AlreadySearched)] call CBA_fnc_localEvent;
};

Expand Down Expand Up @@ -64,19 +64,19 @@ if (_audio isNotEqualTo "") then {
{true},
{
params ["_args"];
_args params ["_object", "_objectData", "_soundDummy"];
_args params ["_object", "_objectData", "_hitPos", "_soundDummy"];
private _searchChance = _objectData select 2;
private _weapons = _objectData select 5;
private _magazines = _objectData select 6;
private _items = _objectData select 7;
private _backpacks = _objectData select 8;

[_hitPos] call FUNC(cacheSearched);

if (_soundDummy isNotEqualTo objNull) then {
deleteVehicle _soundDummy;
};

[_object] call FUNC(cacheSearched);

if ([_searchChance] call EFUNC(common,rollChance)) exitWith {
[QEGVAR(common,tileText), localize LSTRING(NothingFound)] call CBA_fnc_localEvent;
};
Expand Down Expand Up @@ -123,7 +123,7 @@ if (_audio isNotEqualTo "") then {
},
{
params ["_args"];
_args params ["_object", "_objectData", "_soundDummy"];
_args params ["_object", "_objectData", "_hitPos", "_soundDummy"];
private _searchChance = _objectData select 2;
private _weapons = _objectData select 5;
private _magazines = _objectData select 6;
Expand All @@ -136,5 +136,5 @@ if (_audio isNotEqualTo "") then {
deleteVehicle _soundDummy;
};
},
[_object, _objectData, _soundDummy]
[_object, _objectData, _hitPos, _soundDummy]
] call CBA_fnc_progressBar;
Loading