Skip to content
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

Jump to bottom

Interaction/Dragging - Remove actions from scripted weapon holders #9541

Merged
merged 1 commit into from
Oct 20, 2023
Merged

Interaction/Dragging - Remove actions from scripted weapon holders #9541

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions addons/dragging/CfgEventHandlers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@ class Extended_Init_EventHandlers {
class WeaponHolder {
class ADDON {
init = QUOTE(_this call FUNC(initObject));
exclude[] = {"GroundWeaponHolder_Scripted"};
};
};
class WeaponHolderSimulated {
class ADDON {
init = QUOTE(_this call FUNC(initObject));
exclude[] = {"WeaponHolderSimulated_Scripted"};
};
};
class Land_Camping_Light_F {
Expand Down
21 changes: 21 additions & 0 deletions addons/interaction/CfgVehicles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,6 +715,14 @@ class CfgVehicles {
};
};
};
// Don't enable for scripted
class WeaponHolderSimulated_Scripted: WeaponHolderSimulated {
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
delete GVAR(Gear);
};
};
};

class ReammoBox;
// dropped weapons/gear
Expand All @@ -733,6 +741,19 @@ class CfgVehicles {
};
};
};
// Don't enable for scripted
class GroundWeaponHolder: WeaponHolder {
class ACE_Actions: ACE_Actions {
class ACE_MainActions;
};
};
class GroundWeaponHolder_Scripted: GroundWeaponHolder {
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
delete GVAR(Gear);
};
};
};

class Lamps_base_F;
class Land_PortableLight_single_F: Lamps_base_F {
Expand Down