From 6bdb25aba96887fa03988d4c8fd8964c56c4b0d5 Mon Sep 17 00:00:00 2001 From: Jacob Schmidt Date: Sun, 26 Apr 2026 11:58:06 -0500 Subject: [PATCH] refactor: remove unused store menu item and related variables --- .../actor/functions/fnc_initRepository.sqf | 4 +- arma/client/addons/actor/ui/_site/script.js | 6 - arma/client/addons/phone/ui/RscCommon.hpp | 167 ------------------ 3 files changed, 2 insertions(+), 175 deletions(-) diff --git a/arma/client/addons/actor/functions/fnc_initRepository.sqf b/arma/client/addons/actor/functions/fnc_initRepository.sqf index 12a2b4d..3cbfb0e 100644 --- a/arma/client/addons/actor/functions/fnc_initRepository.sqf +++ b/arma/client/addons/actor/functions/fnc_initRepository.sqf @@ -108,16 +108,16 @@ GVAR(ActorRepositoryBaseClass) = compileFinal createHashMapFromArray [ params [["_control", controlNull, [controlNull]]]; private _nearbyActions = []; { - private _storeType = _x getVariable ["storeType", ""]; private _isAtm = _x getVariable ["isAtm", false]; private _isBank = _x getVariable ["isBank", false]; private _isGarage = _x getVariable ["isGarage", false]; private _isLocker = _x getVariable ["isLocker", false]; + private _isStore = _x getVariable ["isStore", false]; private _garageType = _x getVariable ["garageType", ""]; private _deviceType = _x getVariable ["deviceType", ""]; private _isPlayer = _x isKindOf "Man" && isPlayer _x; - if (_storeType isNotEqualTo "") then { _nearbyActions pushBack ["store", _storeType]; }; + if (_isStore) then { _nearbyActions pushBack ["store", true]; }; if (_isAtm) then { _nearbyActions pushBack ["atm", true]; }; if (_isBank) then { _nearbyActions pushBack ["bank", true]; }; if (_isLocker && GVAR(enableVA)) then { _nearbyActions pushBack ["va", true]; }; diff --git a/arma/client/addons/actor/ui/_site/script.js b/arma/client/addons/actor/ui/_site/script.js index 66a283e..0a1c8a1 100644 --- a/arma/client/addons/actor/ui/_site/script.js +++ b/arma/client/addons/actor/ui/_site/script.js @@ -118,12 +118,6 @@ const baseMenuItems = [ description: "View and manage your organization data", action: "actor::open::org", }, - { - id: "store", - title: "Store", - description: "Browse and purchase items from the store", - action: "actor::open::store", - }, ]; const actionDefinitions = { diff --git a/arma/client/addons/phone/ui/RscCommon.hpp b/arma/client/addons/phone/ui/RscCommon.hpp index f50122c..8b57936 100644 --- a/arma/client/addons/phone/ui/RscCommon.hpp +++ b/arma/client/addons/phone/ui/RscCommon.hpp @@ -95,171 +95,4 @@ #define GRID_W (pixelW * pixelGrid * pixelScale) #define GRID_H (pixelH * pixelGrid * pixelScale) -class ScrollBar; -class RscObject; class RscText; -class RscTextSmall; -class RscTitle; -class RscProgress; -class RscProgressNotFreeze; -class RscPicture; -class RscLadderPicture; -class RscPictureKeepAspect; -class RscHTML; -class RscButton; -class RscShortcutButton; -class RscButtonSmall; -class RscEdit; -class RscCombo; -class RscListBox; -class RscListNBox; -class RscXListBox; -class RscTree; -class RscSlider; -class RscSliderH; -class RscXSliderH; -class RscActiveText; -class RscStructuredText; -class RscControlsGroup; -class RscToolbox; -class RscMapControl; -class RscCheckBox; -class RscFrame; -class ctrlDefault; -class ctrlControlsGroup; -class ctrlDefaultText; -class ctrlDefaultButton; -class RscBackgroundStripeTop; -class RscBackgroundStripeBottom; -class RscIGText; -class RscIGProgress; -class RscListBoxKeys; -class RscControlsGroupNoScrollbars; -class RscControlsGroupNoHScrollbars; -class RscControlsGroupNoVScrollbars; -class RscLine; -class RscActivePicture; -class RscButtonTextOnly; -class RscShortcutButtonMain; -class RscButtonEditor; -class RscIGUIShortcutButton; -class RscGearShortcutButton; -class RscButtonMenu; -class RscButtonMenuOK; -class RscButtonMenuCancel; -class RscButtonMenuSteam; -class RscLoadingText; -class RscIGUIListBox; -class RscIGUIListNBox; -class RscBackground; -class RscBackgroundGUI; -class RscBackgroundGUILeft; -class RscBackgroundGUIRight; -class RscBackgroundGUIBottom; -class RscBackgroundGUITop; -class RscBackgroundGUIDark; -class RscBackgroundLogo; -class RscMapControlEmpty; -class RscVignette; -class CA_Mainback; -class CA_Back; -class CA_Title_Back; -class CA_Black_Back; -class CA_Title; -class CA_Logo; -class CA_Logo_Small; -class CA_RscButton; -class CA_RscButton_dialog; -class CA_Ok; -class CA_Ok_image; -class CA_Ok_image2; -class CA_Ok_text; -class ctrlCheckbox; -class ctrlCheckboxBaseline; -class ctrlStatic; -class ctrlControlsGroupNoScrollbars; -class ctrlStructuredText; -class RscTextMulti; -class RscTreeSearch; -class RscVideo; -class RscVideoKeepAspect; -class RscActivePictureKeepAspect; -class RscEditMulti; -class RscMapSignalBackground; -class RscMapSignalPicture; -class RscMapSignalText; -class RscColorPicker; -class RscInterlacingScreen; -class RscFeedback; -class RscTrafficLight; -class RscButtonSearch; -class RscIGUIText; -class RscOpticsText; -class RscOpticsValue; -class RscIGUIValue; -class RscButtonMenuMain; -class RscButtonTestCentered; -class RscDisplaySingleMission_ChallengeOverviewGroup; -class RscDisplayDebriefing_RscTextMultiline; -class RscDisplayDebriefing_ListGroup; -class RscButtonArsenal; -class RscTextNoShadow; -class RscButtonNoColor; -class RscToolboxButton; -class ctrlStaticPicture; -class ctrlStaticPictureKeepAspect; -class ctrlStaticPictureTile; -class ctrlStaticFrame; -class ctrlStaticLine; -class ctrlStaticMulti; -class ctrlStaticBackground; -class ctrlStaticOverlay; -class ctrlStaticTitle; -class ctrlStaticFooter; -class ctrlStaticBackgroundDisable; -class ctrlStaticBackgroundDisableTiles; -class ctrlButton; -class ctrlButtonPicture; -class ctrlButtonPictureKeepAspect; -class ctrlButtonOK; -class ctrlButtonCancel; -class ctrlButtonClose; -class ctrlButtonToolbar; -class ctrlButtonSearch; -class ctrlButtonExpandAll; -class ctrlButtonCollapseAll; -class ctrlButtonFilter; -class ctrlEdit; -class ctrlEditMulti; -class ctrlSliderV; -class ctrlSliderH; -class ctrlCombo; -class ctrlComboToolbar; -class ctrlListbox; -class ctrlToolbox; -class ctrlToolboxPicture; -class ctrlToolboxPictureKeepAspect; -class ctrlCheckboxes; -class ctrlCheckboxesCheckbox; -class ctrlProgress; -class ctrlHTML; -class ctrlActiveText; -class ctrlActivePicture; -class ctrlActivePictureKeepAspect; -class ctrlTree; -class ctrlControlsGroupNoHScrollbars; -class ctrlControlsGroupNoVScrollbars; -class ctrlShortcutButton; -class ctrlShortcutButtonOK; -class ctrlShortcutButtonCancel; -class ctrlShortcutButtonSteam; -class ctrlXListbox; -class ctrlXSliderV; -class ctrlXSliderH; -class ctrlMenu; -class ctrlMenuStrip; -class ctrlMap; -class ctrlMapEmpty; -class ctrlMapMain; -class ctrlListNBox; -class ctrlCheckboxToolbar;