From: otta8634 Date: Tue, 7 Jan 2025 14:45:32 +0000 (+0800) Subject: Rename .turret_name to .m_name X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f39abb0500b80b3a0b49b0c44bd93f87b7ac0702;p=xonotic%2Fxonotic-data.pk3dir.git Rename .turret_name to .m_name Turrets don't also use .m_name so this shouldn't introduce any regressions. Makes it more consistent and removes one unnecessary entity field. Mostly copied from b416d03c68. --- diff --git a/qcsrc/common/turrets/cl_turrets.qc b/qcsrc/common/turrets/cl_turrets.qc index 219b23318..081d8003e 100644 --- a/qcsrc/common/turrets/cl_turrets.qc +++ b/qcsrc/common/turrets/cl_turrets.qc @@ -216,7 +216,7 @@ void turret_construct(entity this, bool isnew) if(this.tur_head == NULL) this.tur_head = spawn(); - this.netname = tur.turret_name; + this.netname = tur.m_name; setorigin(this, this.origin); _setmodel(this, tur.model); diff --git a/qcsrc/common/turrets/config.qc b/qcsrc/common/turrets/config.qc index 14c51be66..777cda91b 100644 --- a/qcsrc/common/turrets/config.qc +++ b/qcsrc/common/turrets/config.qc @@ -65,13 +65,13 @@ void Dump_Turret_Settings() heapsort(TUR_CONFIG_COUNT, T_Config_Queue_Swap, T_Config_Queue_Compare, NULL); // step 4: write queue - TUR_CONFIG_WRITETOFILE(sprintf("// {{{ #%d: %s\n", i, it.turret_name)); + TUR_CONFIG_WRITETOFILE(sprintf("// {{{ #%d: %s\n", i, it.m_name)); for (int j = 0; j < TUR_CONFIG_COUNT; ++j) TUR_CONFIG_WRITETOFILE(config_queue[j]); TUR_CONFIG_WRITETOFILE("// }}}\n"); // step 5: debug info - LOG_INFOF("#%d: %s: %d settings...", i, it.turret_name, TUR_CONFIG_COUNT); + LOG_INFOF("#%d: %s: %d settings...", i, it.m_name, TUR_CONFIG_COUNT); totalsettings += TUR_CONFIG_COUNT; }); #undef TUR_CONFIG_WRITETOFILE diff --git a/qcsrc/common/turrets/sv_turrets.qc b/qcsrc/common/turrets/sv_turrets.qc index cc9700c0a..9a9a902c2 100644 --- a/qcsrc/common/turrets/sv_turrets.qc +++ b/qcsrc/common/turrets/sv_turrets.qc @@ -1356,7 +1356,7 @@ bool turret_initialize(entity this, Turret tur) this.m_id = tur.m_id; this.active = ACTIVE_ACTIVE; this.effects = EF_NODRAW; - this.netname = tur.turret_name; + this.netname = tur.m_name; this.max_health = GetResource(this, RES_HEALTH); this.target_validate_flags = this.target_select_flags; this.ammo = this.ammo_max; diff --git a/qcsrc/common/turrets/turret.qh b/qcsrc/common/turrets/turret.qh index d46d54f58..b50e6ef51 100644 --- a/qcsrc/common/turrets/turret.qh +++ b/qcsrc/common/turrets/turret.qh @@ -8,7 +8,7 @@ CLASS(Turret, Object) /** short name */ ATTRIB(Turret, netname, string); /** human readable name */ - ATTRIB(Turret, turret_name, string, _("Turret")); + ATTRIB(Turret, m_name, string, _("Turret")); /** currently a copy of the model */ ATTRIB(Turret, mdl, string); /** full name of model */ @@ -23,7 +23,7 @@ CLASS(Turret, Object) ATTRIB(Turret, m_maxs, vector, '0 0 0'); METHOD(Turret, display, void(Turret this, void(string name, string icon) returns)) { - returns(this.turret_name, string_null); + returns(this.m_name, string_null); } /** (BOTH) setup turret data */ METHOD(Turret, tr_setup, void(Turret this, entity it)) { diff --git a/qcsrc/common/turrets/turret/ewheel.qh b/qcsrc/common/turrets/turret/ewheel.qh index 8a78d37be..a73c465bf 100644 --- a/qcsrc/common/turrets/turret/ewheel.qh +++ b/qcsrc/common/turrets/turret/ewheel.qh @@ -12,7 +12,7 @@ CLASS(EWheel, Turret) /* model */ ATTRIB_STRZONE(EWheel, model, string, strcat("models/turrets/", this.mdl)); /* head_model */ ATTRIB_STRZONE(EWheel, head_model, string, strcat("models/turrets/", "ewheel-gun1.md3")); /* netname */ ATTRIB(EWheel, netname, string, "ewheel"); -/* fullname */ ATTRIB(EWheel, turret_name, string, _("eWheel Turret")); +/* fullname */ ATTRIB(EWheel, m_name, string, _("eWheel Turret")); ATTRIB(EWheel, m_weapon, Weapon, WEP_EWHEEL); #define X(BEGIN, P, END, class, prefix) \ diff --git a/qcsrc/common/turrets/turret/flac.qh b/qcsrc/common/turrets/turret/flac.qh index 9892cbba3..16330edf2 100644 --- a/qcsrc/common/turrets/turret/flac.qh +++ b/qcsrc/common/turrets/turret/flac.qh @@ -10,7 +10,7 @@ CLASS(Flac, Turret) /* model */ ATTRIB_STRZONE(Flac, model, string, strcat("models/turrets/", this.mdl)); /* head_model */ ATTRIB_STRZONE(Flac, head_model, string, strcat("models/turrets/", "flac.md3")); /* netname */ ATTRIB(Flac, netname, string, "flac"); -/* fullname */ ATTRIB(Flac, turret_name, string, _("FLAC Cannon")); +/* fullname */ ATTRIB(Flac, m_name, string, _("FLAC Cannon")); ATTRIB(Flac, m_weapon, Weapon, WEP_FLAC); #define X(BEGIN, P, END, class, prefix) \ diff --git a/qcsrc/common/turrets/turret/fusionreactor.qh b/qcsrc/common/turrets/turret/fusionreactor.qh index 0723ba582..42ab95c06 100644 --- a/qcsrc/common/turrets/turret/fusionreactor.qh +++ b/qcsrc/common/turrets/turret/fusionreactor.qh @@ -8,7 +8,7 @@ CLASS(FusionReactor, Turret) /* model */ ATTRIB_STRZONE(FusionReactor, model, string, strcat("models/turrets/", this.mdl)); /* head_model */ ATTRIB_STRZONE(FusionReactor, head_model, string, strcat("models/turrets/", "reactor.md3")); /* netname */ ATTRIB(FusionReactor, netname, string, "fusreac"); -/* fullname */ ATTRIB(FusionReactor, turret_name, string, _("Fusion Reactor")); +/* fullname */ ATTRIB(FusionReactor, m_name, string, _("Fusion Reactor")); ENDCLASS(FusionReactor) #define X(BEGIN, P, END, class, prefix) \ diff --git a/qcsrc/common/turrets/turret/hellion.qh b/qcsrc/common/turrets/turret/hellion.qh index 23aaa4abc..a3b964430 100644 --- a/qcsrc/common/turrets/turret/hellion.qh +++ b/qcsrc/common/turrets/turret/hellion.qh @@ -10,7 +10,7 @@ CLASS(Hellion, Turret) /* model */ ATTRIB_STRZONE(Hellion, model, string, strcat("models/turrets/", this.mdl)); /* head_model */ ATTRIB_STRZONE(Hellion, head_model, string, strcat("models/turrets/", "hellion.md3")); /* netname */ ATTRIB(Hellion, netname, string, "hellion"); -/* fullname */ ATTRIB(Hellion, turret_name, string, _("Hellion Missile Turret")); +/* fullname */ ATTRIB(Hellion, m_name, string, _("Hellion Missile Turret")); ATTRIB(Hellion, m_weapon, Weapon, WEP_HELLION); #define X(BEGIN, P, END, class, prefix) \ diff --git a/qcsrc/common/turrets/turret/hk.qh b/qcsrc/common/turrets/turret/hk.qh index 29060a61d..34a454716 100644 --- a/qcsrc/common/turrets/turret/hk.qh +++ b/qcsrc/common/turrets/turret/hk.qh @@ -12,7 +12,7 @@ CLASS(HunterKiller, Turret) /* model */ ATTRIB_STRZONE(HunterKiller, model, string, strcat("models/turrets/", this.mdl)); /* head_model */ ATTRIB_STRZONE(HunterKiller, head_model, string, strcat("models/turrets/", "hk.md3")); /* netname */ ATTRIB(HunterKiller, netname, string, "hk"); -/* fullname */ ATTRIB(HunterKiller, turret_name, string, _("Hunter-Killer Turret")); +/* fullname */ ATTRIB(HunterKiller, m_name, string, _("Hunter-Killer Turret")); ATTRIB(HunterKiller, m_weapon, Weapon, WEP_HK); #define X(BEGIN, P, END, class, prefix) \ diff --git a/qcsrc/common/turrets/turret/machinegun.qh b/qcsrc/common/turrets/turret/machinegun.qh index 99b1f79e4..4250e2834 100644 --- a/qcsrc/common/turrets/turret/machinegun.qh +++ b/qcsrc/common/turrets/turret/machinegun.qh @@ -10,7 +10,7 @@ CLASS(MachineGunTurret, Turret) /* model */ ATTRIB_STRZONE(MachineGunTurret, model, string, strcat("models/turrets/", this.mdl)); /* head_model */ ATTRIB_STRZONE(MachineGunTurret, head_model, string, strcat("models/turrets/", "machinegun.md3")); /* netname */ ATTRIB(MachineGunTurret, netname, string, "machinegun"); -/* fullname */ ATTRIB(MachineGunTurret, turret_name, string, _("Machinegun Turret")); +/* fullname */ ATTRIB(MachineGunTurret, m_name, string, _("Machinegun Turret")); ATTRIB(MachineGunTurret, m_weapon, Weapon, WEP_TUR_MACHINEGUN); #define X(BEGIN, P, END, class, prefix) \ diff --git a/qcsrc/common/turrets/turret/mlrs.qh b/qcsrc/common/turrets/turret/mlrs.qh index 0c7c98f9d..075a1acba 100644 --- a/qcsrc/common/turrets/turret/mlrs.qh +++ b/qcsrc/common/turrets/turret/mlrs.qh @@ -10,7 +10,7 @@ CLASS(MLRSTurret, Turret) /* model */ ATTRIB_STRZONE(MLRSTurret, model, string, strcat("models/turrets/", this.mdl)); /* head_model */ ATTRIB_STRZONE(MLRSTurret, head_model, string, strcat("models/turrets/", "mlrs.md3")); /* netname */ ATTRIB(MLRSTurret, netname, string, "mlrs"); -/* fullname */ ATTRIB(MLRSTurret, turret_name, string, _("MLRS Turret")); +/* fullname */ ATTRIB(MLRSTurret, m_name, string, _("MLRS Turret")); ATTRIB(MLRSTurret, m_weapon, Weapon, WEP_TUR_MLRS); #define X(BEGIN, P, END, class, prefix) \ diff --git a/qcsrc/common/turrets/turret/phaser.qh b/qcsrc/common/turrets/turret/phaser.qh index 0901f5c79..de70502cd 100644 --- a/qcsrc/common/turrets/turret/phaser.qh +++ b/qcsrc/common/turrets/turret/phaser.qh @@ -10,7 +10,7 @@ CLASS(PhaserTurret, Turret) /* model */ ATTRIB_STRZONE(PhaserTurret, model, string, strcat("models/turrets/", this.mdl)); /* head_model */ ATTRIB_STRZONE(PhaserTurret, head_model, string, strcat("models/turrets/", "phaser.md3")); /* netname */ ATTRIB(PhaserTurret, netname, string, "phaser"); -/* fullname */ ATTRIB(PhaserTurret, turret_name, string, _("Phaser Cannon")); +/* fullname */ ATTRIB(PhaserTurret, m_name, string, _("Phaser Cannon")); ATTRIB(PhaserTurret, m_weapon, Weapon, WEP_PHASER); #define X(BEGIN, P, END, class, prefix) \ diff --git a/qcsrc/common/turrets/turret/plasma.qh b/qcsrc/common/turrets/turret/plasma.qh index bc38f6ffd..29225670b 100644 --- a/qcsrc/common/turrets/turret/plasma.qh +++ b/qcsrc/common/turrets/turret/plasma.qh @@ -10,7 +10,7 @@ CLASS(PlasmaTurret, Turret) /* model */ ATTRIB_STRZONE(PlasmaTurret, model, string, strcat("models/turrets/", this.mdl)); /* head_model */ ATTRIB_STRZONE(PlasmaTurret, head_model, string, strcat("models/turrets/", "plasma.md3")); /* netname */ ATTRIB(PlasmaTurret, netname, string, "plasma"); -/* fullname */ ATTRIB(PlasmaTurret, turret_name, string, _("Plasma Cannon")); +/* fullname */ ATTRIB(PlasmaTurret, m_name, string, _("Plasma Cannon")); ATTRIB(PlasmaTurret, m_weapon, Weapon, WEP_PLASMA); #define X(BEGIN, P, END, class, prefix) \ diff --git a/qcsrc/common/turrets/turret/plasma_dual.qh b/qcsrc/common/turrets/turret/plasma_dual.qh index 299475cd0..f97b582ce 100644 --- a/qcsrc/common/turrets/turret/plasma_dual.qh +++ b/qcsrc/common/turrets/turret/plasma_dual.qh @@ -17,7 +17,7 @@ CLASS(DualPlasmaTurret, PlasmaTurret) /* model */ ATTRIB_STRZONE(DualPlasmaTurret, model, string, strcat("models/turrets/", this.mdl)); /* head_model */ ATTRIB_STRZONE(DualPlasmaTurret, head_model, string, strcat("models/turrets/", "plasmad.md3")); /* netname */ ATTRIB(DualPlasmaTurret, netname, string, "plasma_dual"); -/* fullname */ ATTRIB(DualPlasmaTurret, turret_name, string, _("Dual Plasma Cannon")); +/* fullname */ ATTRIB(DualPlasmaTurret, m_name, string, _("Dual Plasma Cannon")); ATTRIB(DualPlasmaTurret, m_weapon, Weapon, WEP_PLASMA_DUAL); #define X(BEGIN, P, END, class, prefix) \ diff --git a/qcsrc/common/turrets/turret/tesla.qh b/qcsrc/common/turrets/turret/tesla.qh index 6f01737be..29cd0a298 100644 --- a/qcsrc/common/turrets/turret/tesla.qh +++ b/qcsrc/common/turrets/turret/tesla.qh @@ -10,7 +10,7 @@ CLASS(TeslaCoil, Turret) /* model */ ATTRIB_STRZONE(TeslaCoil, model, string, strcat("models/turrets/", this.mdl)); /* head_model */ ATTRIB_STRZONE(TeslaCoil, head_model, string, strcat("models/turrets/", "tesla_head.md3")); /* netname */ ATTRIB(TeslaCoil, netname, string, "tesla"); -/* fullname */ ATTRIB(TeslaCoil, turret_name, string, _("Tesla Coil")); +/* fullname */ ATTRIB(TeslaCoil, m_name, string, _("Tesla Coil")); ATTRIB(TeslaCoil, m_weapon, Weapon, WEP_TESLA); #define X(BEGIN, P, END, class, prefix) \ diff --git a/qcsrc/common/turrets/turret/walker.qh b/qcsrc/common/turrets/turret/walker.qh index 466040468..5da7e9fd6 100644 --- a/qcsrc/common/turrets/turret/walker.qh +++ b/qcsrc/common/turrets/turret/walker.qh @@ -12,7 +12,7 @@ CLASS(WalkerTurret, Turret) /* model */ ATTRIB_STRZONE(WalkerTurret, model, string, strcat("models/turrets/", this.mdl)); /* head_model */ ATTRIB_STRZONE(WalkerTurret, head_model, string, strcat("models/turrets/", "walker_head_minigun.md3")); /* netname */ ATTRIB(WalkerTurret, netname, string, "walker"); -/* fullname */ ATTRIB(WalkerTurret, turret_name, string, _("Walker Turret")); +/* fullname */ ATTRIB(WalkerTurret, m_name, string, _("Walker Turret")); ATTRIB(WalkerTurret, m_weapon, Weapon, WEP_WALKER); #define X(BEGIN, P, END, class, prefix) \