From: terencehill Date: Fri, 12 Apr 2019 18:00:42 +0000 (+0200) Subject: Add a macro to dump common turret settings X-Git-Tag: xonotic-v0.8.5~1546^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=934ca973348b7be188bfbdcc90fef7ac37a2cb0f;p=xonotic%2Fxonotic-data.pk3dir.git Add a macro to dump common turret settings --- diff --git a/qcsrc/common/turrets/all.qh b/qcsrc/common/turrets/all.qh index b82af599b..f87b1a274 100644 --- a/qcsrc/common/turrets/all.qh +++ b/qcsrc/common/turrets/all.qh @@ -11,9 +11,41 @@ REGISTRY(Turrets, BITS(5)) REGISTER_REGISTRY(Turrets) REGISTRY_CHECK(Turrets) +#define TR_PROPS_COMMON(P, class, prefix) \ + P(class, prefix, aim_firetolerance_dist, float) \ + P(class, prefix, aim_maxpitch, float) \ + P(class, prefix, aim_maxrot, float) \ + P(class, prefix, aim_speed, float) \ + P(class, prefix, ammo, float) \ + P(class, prefix, ammo_max, float) \ + P(class, prefix, ammo_recharge, float) \ + P(class, prefix, health, float) \ + P(class, prefix, respawntime, float) \ + P(class, prefix, shot_dmg, float) \ + P(class, prefix, shot_force, float) \ + P(class, prefix, shot_radius, float) \ + P(class, prefix, shot_refire, float) \ + P(class, prefix, shot_speed, float) \ + P(class, prefix, shot_spread, float) \ + P(class, prefix, shot_volly, float) \ + P(class, prefix, shot_volly_refire, float) \ + P(class, prefix, target_range, float) \ + P(class, prefix, target_range_min, float) \ + P(class, prefix, target_range_optimal, float) \ + P(class, prefix, target_select_anglebias, float) \ + P(class, prefix, target_select_missilebias, float) \ + P(class, prefix, target_select_playerbias, float) \ + P(class, prefix, target_select_rangebias, float) \ + P(class, prefix, target_select_samebias, float) \ + P(class, prefix, track_accel_pitch, float) \ + P(class, prefix, track_accel_rot, float) \ + P(class, prefix, track_blendrate, float) \ + P(class, prefix, track_type, float) \ + /**/ + #define TR_PROPS(L, class, prefix) \ L(TR_CONFIG_BEGIN, TR_CONFIG, TR_CONFIG_END, class, prefix) \ - /**/ \ + /**/ #define TR_CONFIG(class, turname, fld, T) _TR_CONFIG(class, fld, T, turname) #define TR_CONFIG_BEGIN(class) METHOD(class, tr_config, void(class this)) { diff --git a/qcsrc/common/turrets/turret/ewheel.qh b/qcsrc/common/turrets/turret/ewheel.qh index 4e4cc31fd..8a78d37be 100644 --- a/qcsrc/common/turrets/turret/ewheel.qh +++ b/qcsrc/common/turrets/turret/ewheel.qh @@ -17,39 +17,11 @@ CLASS(EWheel, Turret) #define X(BEGIN, P, END, class, prefix) \ BEGIN(class) \ - P(class, prefix, aim_firetolerance_dist, float) \ - P(class, prefix, aim_maxpitch, float) \ - P(class, prefix, aim_maxrot, float) \ - P(class, prefix, aim_speed, float) \ - P(class, prefix, ammo, float) \ - P(class, prefix, ammo_max, float) \ - P(class, prefix, ammo_recharge, float) \ - P(class, prefix, health, float) \ - P(class, prefix, respawntime, float) \ - P(class, prefix, shot_dmg, float) \ - P(class, prefix, shot_force, float) \ - P(class, prefix, shot_radius, float) \ - P(class, prefix, shot_refire, float) \ - P(class, prefix, shot_speed, float) \ - P(class, prefix, shot_spread, float) \ - P(class, prefix, shot_volly, float) \ - P(class, prefix, shot_volly_refire, float) \ + TR_PROPS_COMMON(P, class, prefix) \ P(class, prefix, speed_fast, float) \ P(class, prefix, speed_slow, float) \ P(class, prefix, speed_slower, float) \ P(class, prefix, speed_stop, float) \ - P(class, prefix, target_range, float) \ - P(class, prefix, target_range_min, float) \ - P(class, prefix, target_range_optimal, float) \ - P(class, prefix, target_select_anglebias, float) \ - P(class, prefix, target_select_missilebias, float) \ - P(class, prefix, target_select_playerbias, float) \ - P(class, prefix, target_select_rangebias, float) \ - P(class, prefix, target_select_samebias, float) \ - P(class, prefix, track_accel_pitch, float) \ - P(class, prefix, track_accel_rot, float) \ - P(class, prefix, track_blendrate, float) \ - P(class, prefix, track_type, float) \ P(class, prefix, turnrate, float) \ END() TR_PROPS(X, EWheel, ewheel) diff --git a/qcsrc/common/turrets/turret/flac.qh b/qcsrc/common/turrets/turret/flac.qh index 041a8ea88..9892cbba3 100644 --- a/qcsrc/common/turrets/turret/flac.qh +++ b/qcsrc/common/turrets/turret/flac.qh @@ -15,35 +15,7 @@ CLASS(Flac, Turret) #define X(BEGIN, P, END, class, prefix) \ BEGIN(class) \ - P(class, prefix, aim_firetolerance_dist, float) \ - P(class, prefix, aim_maxpitch, float) \ - P(class, prefix, aim_maxrot, float) \ - P(class, prefix, aim_speed, float) \ - P(class, prefix, ammo, float) \ - P(class, prefix, ammo_max, float) \ - P(class, prefix, ammo_recharge, float) \ - P(class, prefix, health, float) \ - P(class, prefix, respawntime, float) \ - P(class, prefix, shot_dmg, float) \ - P(class, prefix, shot_force, float) \ - P(class, prefix, shot_radius, float) \ - P(class, prefix, shot_refire, float) \ - P(class, prefix, shot_speed, float) \ - P(class, prefix, shot_spread, float) \ - P(class, prefix, shot_volly, float) \ - P(class, prefix, shot_volly_refire, float) \ - P(class, prefix, target_range, float) \ - P(class, prefix, target_range_min, float) \ - P(class, prefix, target_range_optimal, float) \ - P(class, prefix, target_select_anglebias, float) \ - P(class, prefix, target_select_missilebias, float) \ - P(class, prefix, target_select_playerbias, float) \ - P(class, prefix, target_select_rangebias, float) \ - P(class, prefix, target_select_samebias, float) \ - P(class, prefix, track_accel_pitch, float) \ - P(class, prefix, track_accel_rot, float) \ - P(class, prefix, track_blendrate, float) \ - P(class, prefix, track_type, float) \ + TR_PROPS_COMMON(P, class, prefix) \ END() TR_PROPS(X, Flac, flac) #undef X diff --git a/qcsrc/common/turrets/turret/fusionreactor.qh b/qcsrc/common/turrets/turret/fusionreactor.qh index f3b1bfa54..0723ba582 100644 --- a/qcsrc/common/turrets/turret/fusionreactor.qh +++ b/qcsrc/common/turrets/turret/fusionreactor.qh @@ -13,34 +13,7 @@ ENDCLASS(FusionReactor) #define X(BEGIN, P, END, class, prefix) \ BEGIN(class) \ - P(class, prefix, aim_firetolerance_dist, float) \ - P(class, prefix, aim_maxpitch, float) \ - P(class, prefix, aim_maxrot, float) \ - P(class, prefix, aim_speed, float) \ - P(class, prefix, ammo, float) \ - P(class, prefix, ammo_max, float) \ - P(class, prefix, ammo_recharge, float) \ - P(class, prefix, health, float) \ - P(class, prefix, respawntime, float) \ - P(class, prefix, shot_dmg, float) \ - P(class, prefix, shot_force, float) \ - P(class, prefix, shot_radius, float) \ - P(class, prefix, shot_refire, float) \ - P(class, prefix, shot_speed, float) \ - P(class, prefix, shot_spread, float) \ - P(class, prefix, shot_volly, float) \ - P(class, prefix, shot_volly_refire, float) \ - P(class, prefix, target_range, float) \ - P(class, prefix, target_range_min, float) \ - P(class, prefix, target_range_optimal, float) \ - P(class, prefix, target_select_anglebias, float) \ - P(class, prefix, target_select_playerbias, float) \ - P(class, prefix, target_select_rangebias, float) \ - P(class, prefix, target_select_samebias, float) \ - P(class, prefix, track_accel_pitch, float) \ - P(class, prefix, track_accel_rot, float) \ - P(class, prefix, track_blendrate, float) \ - P(class, prefix, track_type, float) \ + TR_PROPS_COMMON(P, class, prefix) \ END() TR_PROPS(X, FusionReactor, fusreac) #undef X diff --git a/qcsrc/common/turrets/turret/hellion.qh b/qcsrc/common/turrets/turret/hellion.qh index 83556ebc5..23aaa4abc 100644 --- a/qcsrc/common/turrets/turret/hellion.qh +++ b/qcsrc/common/turrets/turret/hellion.qh @@ -15,37 +15,9 @@ CLASS(Hellion, Turret) #define X(BEGIN, P, END, class, prefix) \ BEGIN(class) \ - P(class, prefix, aim_firetolerance_dist, float) \ - P(class, prefix, aim_maxpitch, float) \ - P(class, prefix, aim_maxrot, float) \ - P(class, prefix, aim_speed, float) \ - P(class, prefix, ammo, float) \ - P(class, prefix, ammo_max, float) \ - P(class, prefix, ammo_recharge, float) \ - P(class, prefix, health, float) \ - P(class, prefix, respawntime, float) \ - P(class, prefix, shot_dmg, float) \ - P(class, prefix, shot_force, float) \ - P(class, prefix, shot_radius, float) \ - P(class, prefix, shot_refire, float) \ - P(class, prefix, shot_speed, float) \ + TR_PROPS_COMMON(P, class, prefix) \ P(class, prefix, shot_speed_gain, float) \ P(class, prefix, shot_speed_max, float) \ - P(class, prefix, shot_spread, float) \ - P(class, prefix, shot_volly, float) \ - P(class, prefix, shot_volly_refire, float) \ - P(class, prefix, target_range, float) \ - P(class, prefix, target_range_min, float) \ - P(class, prefix, target_range_optimal, float) \ - P(class, prefix, target_select_anglebias, float) \ - P(class, prefix, target_select_missilebias, float) \ - P(class, prefix, target_select_playerbias, float) \ - P(class, prefix, target_select_rangebias, float) \ - P(class, prefix, target_select_samebias, float) \ - P(class, prefix, track_accel_pitch, float) \ - P(class, prefix, track_accel_rot, float) \ - P(class, prefix, track_blendrate, float) \ - P(class, prefix, track_type, float) \ END() TR_PROPS(X, Hellion, hellion) #undef X diff --git a/qcsrc/common/turrets/turret/hk.qh b/qcsrc/common/turrets/turret/hk.qh index c60d0f5fb..29060a61d 100644 --- a/qcsrc/common/turrets/turret/hk.qh +++ b/qcsrc/common/turrets/turret/hk.qh @@ -17,40 +17,12 @@ CLASS(HunterKiller, Turret) #define X(BEGIN, P, END, class, prefix) \ BEGIN(class) \ - P(class, prefix, aim_firetolerance_dist, float) \ - P(class, prefix, aim_maxpitch, float) \ - P(class, prefix, aim_maxrot, float) \ - P(class, prefix, aim_speed, float) \ - P(class, prefix, ammo, float) \ - P(class, prefix, ammo_max, float) \ - P(class, prefix, ammo_recharge, float) \ - P(class, prefix, health, float) \ - P(class, prefix, respawntime, float) \ - P(class, prefix, shot_dmg, float) \ - P(class, prefix, shot_force, float) \ - P(class, prefix, shot_radius, float) \ - P(class, prefix, shot_refire, float) \ - P(class, prefix, shot_speed, float) \ + TR_PROPS_COMMON(P, class, prefix) \ P(class, prefix, shot_speed_accel, float) \ P(class, prefix, shot_speed_accel2, float) \ P(class, prefix, shot_speed_decel, float) \ P(class, prefix, shot_speed_max, float) \ P(class, prefix, shot_speed_turnrate, float) \ - P(class, prefix, shot_spread, float) \ - P(class, prefix, shot_volly, float) \ - P(class, prefix, shot_volly_refire, float) \ - P(class, prefix, target_range, float) \ - P(class, prefix, target_range_min, float) \ - P(class, prefix, target_range_optimal, float) \ - P(class, prefix, target_select_anglebias, float) \ - P(class, prefix, target_select_missilebias, float) \ - P(class, prefix, target_select_playerbias, float) \ - P(class, prefix, target_select_rangebias, float) \ - P(class, prefix, target_select_samebias, float) \ - P(class, prefix, track_accel_pitch, float) \ - P(class, prefix, track_accel_rot, float) \ - P(class, prefix, track_blendrate, float) \ - P(class, prefix, track_type, float) \ END() TR_PROPS(X, HunterKiller, hk) #undef X diff --git a/qcsrc/common/turrets/turret/machinegun.qh b/qcsrc/common/turrets/turret/machinegun.qh index a6d950799..99b1f79e4 100644 --- a/qcsrc/common/turrets/turret/machinegun.qh +++ b/qcsrc/common/turrets/turret/machinegun.qh @@ -15,35 +15,7 @@ CLASS(MachineGunTurret, Turret) #define X(BEGIN, P, END, class, prefix) \ BEGIN(class) \ - P(class, prefix, aim_firetolerance_dist, float) \ - P(class, prefix, aim_maxpitch, float) \ - P(class, prefix, aim_maxrot, float) \ - P(class, prefix, aim_speed, float) \ - P(class, prefix, ammo, float) \ - P(class, prefix, ammo_max, float) \ - P(class, prefix, ammo_recharge, float) \ - P(class, prefix, health, float) \ - P(class, prefix, respawntime, float) \ - P(class, prefix, shot_dmg, float) \ - P(class, prefix, shot_force, float) \ - P(class, prefix, shot_radius, float) \ - P(class, prefix, shot_refire, float) \ - P(class, prefix, shot_speed, float) \ - P(class, prefix, shot_spread, float) \ - P(class, prefix, shot_volly, float) \ - P(class, prefix, shot_volly_refire, float) \ - P(class, prefix, target_range, float) \ - P(class, prefix, target_range_min, float) \ - P(class, prefix, target_range_optimal, float) \ - P(class, prefix, target_select_anglebias, float) \ - P(class, prefix, target_select_missilebias, float) \ - P(class, prefix, target_select_playerbias, float) \ - P(class, prefix, target_select_rangebias, float) \ - P(class, prefix, target_select_samebias, float) \ - P(class, prefix, track_accel_pitch, float) \ - P(class, prefix, track_accel_rot, float) \ - P(class, prefix, track_blendrate, float) \ - P(class, prefix, track_type, float) \ + TR_PROPS_COMMON(P, class, prefix) \ END() TR_PROPS(X, MachineGunTurret, machinegun) #undef X diff --git a/qcsrc/common/turrets/turret/mlrs.qh b/qcsrc/common/turrets/turret/mlrs.qh index 78c1f76e0..0c7c98f9d 100644 --- a/qcsrc/common/turrets/turret/mlrs.qh +++ b/qcsrc/common/turrets/turret/mlrs.qh @@ -15,35 +15,7 @@ CLASS(MLRSTurret, Turret) #define X(BEGIN, P, END, class, prefix) \ BEGIN(class) \ - P(class, prefix, aim_firetolerance_dist, float) \ - P(class, prefix, aim_maxpitch, float) \ - P(class, prefix, aim_maxrot, float) \ - P(class, prefix, aim_speed, float) \ - P(class, prefix, ammo, float) \ - P(class, prefix, ammo_max, float) \ - P(class, prefix, ammo_recharge, float) \ - P(class, prefix, health, float) \ - P(class, prefix, respawntime, float) \ - P(class, prefix, shot_dmg, float) \ - P(class, prefix, shot_force, float) \ - P(class, prefix, shot_radius, float) \ - P(class, prefix, shot_refire, float) \ - P(class, prefix, shot_speed, float) \ - P(class, prefix, shot_spread, float) \ - P(class, prefix, shot_volly, float) \ - P(class, prefix, shot_volly_refire, float) \ - P(class, prefix, target_range, float) \ - P(class, prefix, target_range_min, float) \ - P(class, prefix, target_range_optimal, float) \ - P(class, prefix, target_select_anglebias, float) \ - P(class, prefix, target_select_missilebias, float) \ - P(class, prefix, target_select_playerbias, float) \ - P(class, prefix, target_select_rangebias, float) \ - P(class, prefix, target_select_samebias, float) \ - P(class, prefix, track_accel_pitch, float) \ - P(class, prefix, track_accel_rot, float) \ - P(class, prefix, track_blendrate, float) \ - P(class, prefix, track_type, float) \ + TR_PROPS_COMMON(P, class, prefix) \ END() TR_PROPS(X, MLRSTurret, mlrs) #undef X diff --git a/qcsrc/common/turrets/turret/phaser.qh b/qcsrc/common/turrets/turret/phaser.qh index 538b62f21..0901f5c79 100644 --- a/qcsrc/common/turrets/turret/phaser.qh +++ b/qcsrc/common/turrets/turret/phaser.qh @@ -15,35 +15,7 @@ CLASS(PhaserTurret, Turret) #define X(BEGIN, P, END, class, prefix) \ BEGIN(class) \ - P(class, prefix, aim_firetolerance_dist, float) \ - P(class, prefix, aim_maxpitch, float) \ - P(class, prefix, aim_maxrot, float) \ - P(class, prefix, aim_speed, float) \ - P(class, prefix, ammo, float) \ - P(class, prefix, ammo_max, float) \ - P(class, prefix, ammo_recharge, float) \ - P(class, prefix, health, float) \ - P(class, prefix, respawntime, float) \ - P(class, prefix, shot_dmg, float) \ - P(class, prefix, shot_force, float) \ - P(class, prefix, shot_radius, float) \ - P(class, prefix, shot_refire, float) \ - P(class, prefix, shot_speed, float) \ - P(class, prefix, shot_spread, float) \ - P(class, prefix, shot_volly, float) \ - P(class, prefix, shot_volly_refire, float) \ - P(class, prefix, target_range, float) \ - P(class, prefix, target_range_min, float) \ - P(class, prefix, target_range_optimal, float) \ - P(class, prefix, target_select_anglebias, float) \ - P(class, prefix, target_select_missilebias, float) \ - P(class, prefix, target_select_playerbias, float) \ - P(class, prefix, target_select_rangebias, float) \ - P(class, prefix, target_select_samebias, float) \ - P(class, prefix, track_accel_pitch, float) \ - P(class, prefix, track_accel_rot, float) \ - P(class, prefix, track_blendrate, float) \ - P(class, prefix, track_type, float) \ + TR_PROPS_COMMON(P, class, prefix) \ END() TR_PROPS(X, PhaserTurret, phaser) #undef X diff --git a/qcsrc/common/turrets/turret/plasma.qh b/qcsrc/common/turrets/turret/plasma.qh index a6be4dd7e..bc38f6ffd 100644 --- a/qcsrc/common/turrets/turret/plasma.qh +++ b/qcsrc/common/turrets/turret/plasma.qh @@ -15,35 +15,7 @@ CLASS(PlasmaTurret, Turret) #define X(BEGIN, P, END, class, prefix) \ BEGIN(class) \ - P(class, prefix, aim_firetolerance_dist, float) \ - P(class, prefix, aim_maxpitch, float) \ - P(class, prefix, aim_maxrot, float) \ - P(class, prefix, aim_speed, float) \ - P(class, prefix, ammo, float) \ - P(class, prefix, ammo_max, float) \ - P(class, prefix, ammo_recharge, float) \ - P(class, prefix, health, float) \ - P(class, prefix, respawntime, float) \ - P(class, prefix, shot_dmg, float) \ - P(class, prefix, shot_force, float) \ - P(class, prefix, shot_radius, float) \ - P(class, prefix, shot_refire, float) \ - P(class, prefix, shot_speed, float) \ - P(class, prefix, shot_spread, float) \ - P(class, prefix, shot_volly, float) \ - P(class, prefix, shot_volly_refire, float) \ - P(class, prefix, target_range, float) \ - P(class, prefix, target_range_min, float) \ - P(class, prefix, target_range_optimal, float) \ - P(class, prefix, target_select_anglebias, float) \ - P(class, prefix, target_select_missilebias, float) \ - P(class, prefix, target_select_playerbias, float) \ - P(class, prefix, target_select_rangebias, float) \ - P(class, prefix, target_select_samebias, float) \ - P(class, prefix, track_accel_pitch, float) \ - P(class, prefix, track_accel_rot, float) \ - P(class, prefix, track_blendrate, float) \ - P(class, prefix, track_type, float) \ + TR_PROPS_COMMON(P, class, prefix) \ END() TR_PROPS(X, PlasmaTurret, plasma) #undef X diff --git a/qcsrc/common/turrets/turret/plasma_dual.qh b/qcsrc/common/turrets/turret/plasma_dual.qh index e444056c9..c0f63c103 100644 --- a/qcsrc/common/turrets/turret/plasma_dual.qh +++ b/qcsrc/common/turrets/turret/plasma_dual.qh @@ -22,35 +22,7 @@ CLASS(DualPlasmaTurret, PlasmaTurret) #define X(BEGIN, P, END, class, prefix) \ BEGIN(class) \ - P(class, prefix, aim_firetolerance_dist, float) \ - P(class, prefix, aim_maxpitch, float) \ - P(class, prefix, aim_maxrot, float) \ - P(class, prefix, aim_speed, float) \ - P(class, prefix, ammo, float) \ - P(class, prefix, ammo_max, float) \ - P(class, prefix, ammo_recharge, float) \ - P(class, prefix, health, float) \ - P(class, prefix, respawntime, float) \ - P(class, prefix, shot_dmg, float) \ - P(class, prefix, shot_force, float) \ - P(class, prefix, shot_radius, float) \ - P(class, prefix, shot_refire, float) \ - P(class, prefix, shot_speed, float) \ - P(class, prefix, shot_spread, float) \ - P(class, prefix, shot_volly, float) \ - P(class, prefix, shot_volly_refire, float) \ - P(class, prefix, target_range, float) \ - P(class, prefix, target_range_min, float) \ - P(class, prefix, target_range_optimal, float) \ - P(class, prefix, target_select_anglebias, float) \ - P(class, prefix, target_select_missilebias, float) \ - P(class, prefix, target_select_playerbias, float) \ - P(class, prefix, target_select_rangebias, float) \ - P(class, prefix, target_select_samebias, float) \ - P(class, prefix, track_accel_pitch, float) \ - P(class, prefix, track_accel_rot, float) \ - P(class, prefix, track_blendrate, float) \ - P(class, prefix, track_type, float) \ + TR_PROPS_COMMON(P, class, prefix) \ END() TR_PROPS(X, DualPlasmaTurret, plasma_dual) #undef X diff --git a/qcsrc/common/turrets/turret/tesla.qh b/qcsrc/common/turrets/turret/tesla.qh index 02b0d4af2..6f01737be 100644 --- a/qcsrc/common/turrets/turret/tesla.qh +++ b/qcsrc/common/turrets/turret/tesla.qh @@ -15,35 +15,7 @@ CLASS(TeslaCoil, Turret) #define X(BEGIN, P, END, class, prefix) \ BEGIN(class) \ - P(class, prefix, aim_firetolerance_dist, float) \ - P(class, prefix, aim_maxpitch, float) \ - P(class, prefix, aim_maxrot, float) \ - P(class, prefix, aim_speed, float) \ - P(class, prefix, ammo, float) \ - P(class, prefix, ammo_max, float) \ - P(class, prefix, ammo_recharge, float) \ - P(class, prefix, health, float) \ - P(class, prefix, respawntime, float) \ - P(class, prefix, shot_dmg, float) \ - P(class, prefix, shot_force, float) \ - P(class, prefix, shot_radius, float) \ - P(class, prefix, shot_refire, float) \ - P(class, prefix, shot_speed, float) \ - P(class, prefix, shot_spread, float) \ - P(class, prefix, shot_volly, float) \ - P(class, prefix, shot_volly_refire, float) \ - P(class, prefix, target_range, float) \ - P(class, prefix, target_range_min, float) \ - P(class, prefix, target_range_optimal, float) \ - P(class, prefix, target_select_anglebias, float) \ - P(class, prefix, target_select_missilebias, float) \ - P(class, prefix, target_select_playerbias, float) \ - P(class, prefix, target_select_rangebias, float) \ - P(class, prefix, target_select_samebias, float) \ - P(class, prefix, track_accel_pitch, float) \ - P(class, prefix, track_accel_rot, float) \ - P(class, prefix, track_blendrate, float) \ - P(class, prefix, track_type, float) \ + TR_PROPS_COMMON(P, class, prefix) \ END() TR_PROPS(X, TeslaCoil, tesla) #undef X diff --git a/qcsrc/common/turrets/turret/walker.qh b/qcsrc/common/turrets/turret/walker.qh index ce2023dc1..466040468 100644 --- a/qcsrc/common/turrets/turret/walker.qh +++ b/qcsrc/common/turrets/turret/walker.qh @@ -17,18 +17,10 @@ CLASS(WalkerTurret, Turret) #define X(BEGIN, P, END, class, prefix) \ BEGIN(class) \ - P(class, prefix, aim_firetolerance_dist, float) \ - P(class, prefix, aim_maxpitch, float) \ - P(class, prefix, aim_maxrot, float) \ - P(class, prefix, aim_speed, float) \ - P(class, prefix, ammo, float) \ - P(class, prefix, ammo_max, float) \ - P(class, prefix, ammo_recharge, float) \ - P(class, prefix, health, float) \ + TR_PROPS_COMMON(P, class, prefix) \ P(class, prefix, melee_damage, float) \ P(class, prefix, melee_force, float) \ P(class, prefix, melee_range, float) \ - P(class, prefix, respawntime, float) \ P(class, prefix, rocket_damage, float) \ P(class, prefix, rocket_force, float) \ P(class, prefix, rocket_radius, float) \ @@ -37,32 +29,12 @@ CLASS(WalkerTurret, Turret) P(class, prefix, rocket_refire, float) \ P(class, prefix, rocket_speed, float) \ P(class, prefix, rocket_turnrate, float) \ - P(class, prefix, shot_dmg, float) \ - P(class, prefix, shot_force, float) \ - P(class, prefix, shot_radius, float) \ - P(class, prefix, shot_refire, float) \ - P(class, prefix, shot_speed, float) \ - P(class, prefix, shot_spread, float) \ - P(class, prefix, shot_volly, float) \ - P(class, prefix, shot_volly_refire, float) \ P(class, prefix, speed_jump, float) \ P(class, prefix, speed_roam, float) \ P(class, prefix, speed_run, float) \ P(class, prefix, speed_stop, float) \ P(class, prefix, speed_swim, float) \ P(class, prefix, speed_walk, float) \ - P(class, prefix, target_range, float) \ - P(class, prefix, target_range_min, float) \ - P(class, prefix, target_range_optimal, float) \ - P(class, prefix, target_select_anglebias, float) \ - P(class, prefix, target_select_missilebias, float) \ - P(class, prefix, target_select_playerbias, float) \ - P(class, prefix, target_select_rangebias, float) \ - P(class, prefix, target_select_samebias, float) \ - P(class, prefix, track_accel_pitch, float) \ - P(class, prefix, track_accel_rot, float) \ - P(class, prefix, track_blendrate, float) \ - P(class, prefix, track_type, float) \ P(class, prefix, turn, float) \ P(class, prefix, turn_run, float) \ P(class, prefix, turn_strafe, float) \ diff --git a/turrets.cfg b/turrets.cfg index b16c16ac4..6fc860bd1 100644 --- a/turrets.cfg +++ b/turrets.cfg @@ -116,6 +116,7 @@ set g_turrets_unit_fusreac_target_select_rangebias 0 set g_turrets_unit_fusreac_target_select_samebias 0 set g_turrets_unit_fusreac_target_select_anglebias 0 set g_turrets_unit_fusreac_target_select_playerbias 0 +set g_turrets_unit_fusreac_target_select_missilebias 0 set g_turrets_unit_fusreac_aim_firetolerance_dist 0 set g_turrets_unit_fusreac_aim_speed 0 set g_turrets_unit_fusreac_aim_maxrot 0