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.

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

General - Fix modifying read-only configs #10796

Merged
merged 3 commits into from
Mar 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion addons/advanced_throwing/CfgAmmo.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ class CfgAmmo {
GVAR(torqueDirection)[] = {1, 1, 0};
GVAR(torqueMagnitude) = "(50 + random 100) * selectRandom [1, -1]";
};
class GrenadeCore: Default {
class GrenadeCore: Default {};
class FlareCore: GrenadeCore {};
class FlareBase: FlareCore {
GVAR(torqueDirection)[] = {1, 1, 0};
GVAR(torqueMagnitude) = "(50 + random 100) * selectRandom [1, -1]";
};
class GrenadeBase: GrenadeCore {
GVAR(torqueDirection)[] = {1, 1, 0};
GVAR(torqueMagnitude) = "(50 + random 100) * selectRandom [1, -1]";
};
Expand Down
6 changes: 1 addition & 5 deletions addons/explosives/CfgAmmo.hpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
class CfgAmmo {
// All explosive based Ammo classes. These are all listed in case they become required.
class Default;

class TimeBombCore: Default {
GVAR(defuseTime) = 5;
};

// GVAR(defuseTime) is the defuse time (default of 5 in ACE_Explosives_fnc_StartDefuse)
// GVAR(size) = 0; is small size
// GVAR(size) = 1; is large size
class ClaymoreDirectionalMine_Remote_Ammo;
Expand Down
3 changes: 2 additions & 1 deletion addons/frag/CfgAmmoFragParameters.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,8 @@ class ProbingBeam_01_F: BulletBase {
class IRStrobeBase: GrenadeCore {
GVAR(skip) = 1;
};
class FlareCore: GrenadeCore { // flares shouldn't have EH, but in case
class FlareCore: GrenadeCore {}; // flares shouldn't have EH, but in case
class FlareBase: FlareCore {
GVAR(skip) = 1;
};

Expand Down
7 changes: 0 additions & 7 deletions addons/minedetector/CfgAmmo.hpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
class CfgAmmo {
// Seems to not get inherited
class Default;
class TimeBombCore: Default {
GVAR(detectable) = 1;
};

// These below do get inherited
class DirectionalBombCore;
class DirectionalBombBase: DirectionalBombCore {
GVAR(detectable) = 1;
Expand Down
4 changes: 2 additions & 2 deletions addons/rearm/CfgAmmo.hpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
class CfgAmmo {

class BombCore;
class LaserBombCore: BombCore {
class LaserBombCore: BombCore {};
class ammo_Bomb_LaserGuidedBase: LaserBombCore {
GVAR(caliber) = 250; // Default caliber for bombs
};
class MissileCore;
Expand Down Expand Up @@ -181,7 +182,6 @@ class CfgAmmo {
GVAR(dummy) = QGVAR(Bo_Mk82);
};

class ammo_Bomb_LaserGuidedBase: LaserBombCore {};
class Bo_GBU12_LGB: ammo_Bomb_LaserGuidedBase {
GVAR(caliber) = 250; // Default caliber for bombs
GVAR(dummy) = QGVAR(Bo_GBU12_LGB);
Expand Down