Use m_name for vehicles and monsters (cherry-pick 2e32f2e7d3)

Previously monster_name and vehicle_name were used, which were obviously used nowhere else.
Renamed them both to m_name so that there's less unnecessary entity fields, and for consistency's sake.

diff --git a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
index 39f45666db19a944fe151ae9ea4467798c27a5a8..48657df2e2d5411f62eeb8daf3c78bfde1f66828 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
+++ b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
@@ -680,7 +680,7 @@ void ctf_Handle_Return(entity flag, entity player)
        // messages and sounds
        if(IS_MONSTER(player))
        {
-               Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(flag.team, INFO_CTF_RETURN_MONSTER), player.monster_name);
+               Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(flag.team, INFO_CTF_RETURN_MONSTER), player.m_name);
        }
        else if(flag.team)
        {

diff --git a/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc b/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc
index ceb6cf8295ad3ff4c855757160d785569de74ef2..544f6512d6b455ffa83b869d4e632f2a9a0813a9 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc
+++ b/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc
@@ -379,7 +379,7 @@ MUTATOR_HOOKFUNCTION(inv, MonsterSpawn)
        mon.monster_skill = inv_monsterskill;
 
        if(mon.monsterdef.spawnflags & MON_FLAG_SUPERMONSTER)
-               Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_INVASION_SUPERMONSTER, mon.monster_name);
+               Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_INVASION_SUPERMONSTER, mon.m_name);
 }
 
 MUTATOR_HOOKFUNCTION(inv, SV_StartFrame)

diff --git a/qcsrc/common/monsters/monster.qh b/qcsrc/common/monsters/monster.qh
index 8544edc9d52c79512c71f4b6b988d63eafe41e66..702267c3ad2e1b37883d66a61eaacce0210f7e6c 100644 (file)
--- a/qcsrc/common/monsters/monster.qh
+++ b/qcsrc/common/monsters/monster.qh
@@ -33,7 +33,7 @@ CLASS(Monster, Object)
     /** attributes */
     ATTRIB(Monster, spawnflags, int, 0);
     /** human readable name */
-    ATTRIB(Monster, monster_name, string, _("Monster"));
+    ATTRIB(Monster, m_name, string, _("Monster"));
     /** short name */
     ATTRIB(Monster, netname, string, "");
     /** color */

diff --git a/qcsrc/common/monsters/monster/golem.qh b/qcsrc/common/monsters/monster/golem.qh
index 8cebd86a35ffe60e537e8cb4f423de2a25dfe104..2f6ad8417eca97a6716abbc349994ea43d42c8ba 100644 (file)
--- a/qcsrc/common/monsters/monster/golem.qh
+++ b/qcsrc/common/monsters/monster/golem.qh
@@ -14,7 +14,7 @@ CLASS(Golem, Monster)
     ATTRIB(Golem, m_model, Model, MDL_MON_GOLEM);
 #endif
     ATTRIB(Golem, netname, string, "golem");
-    ATTRIB(Golem, monster_name, string, _("Golem"));
+    ATTRIB(Golem, m_name, string, _("Golem"));
 ENDCLASS(Golem)
 
 REGISTER_MONSTER(GOLEM, NEW(Golem));

diff --git a/qcsrc/common/monsters/monster/mage.qh b/qcsrc/common/monsters/monster/mage.qh
index 8331c4857ac9ce27ea02b8082a1dbb325557cd47..a5e3b9e0a0f227a2429ffd64665b0fa2b87b4a75 100644 (file)
--- a/qcsrc/common/monsters/monster/mage.qh
+++ b/qcsrc/common/monsters/monster/mage.qh
@@ -14,7 +14,7 @@ CLASS(Mage, Monster)
     ATTRIB(Mage, m_model, Model, MDL_MON_MAGE);
 #endif
     ATTRIB(Mage, netname, string, "mage");
-    ATTRIB(Mage, monster_name, string, _("Mage"));
+    ATTRIB(Mage, m_name, string, _("Mage"));
 ENDCLASS(Mage)
 
 REGISTER_MONSTER(MAGE, NEW(Mage));

diff --git a/qcsrc/common/monsters/monster/spider.qh b/qcsrc/common/monsters/monster/spider.qh
index 5db6a0b8e408f9f7868a068447c8df47627fa55f..e0fd001f9a994323b715fc0101f66cd8be0c60ec 100644 (file)
--- a/qcsrc/common/monsters/monster/spider.qh
+++ b/qcsrc/common/monsters/monster/spider.qh
@@ -14,7 +14,7 @@ CLASS(Spider, Monster)
     ATTRIB(Spider, m_model, Model, MDL_MON_SPIDER);
 #endif
     ATTRIB(Spider, netname, string, "spider");
-    ATTRIB(Spider, monster_name, string, _("Spider"));
+    ATTRIB(Spider, m_name, string, _("Spider"));
 ENDCLASS(Spider)
 
 REGISTER_MONSTER(SPIDER, NEW(Spider));

diff --git a/qcsrc/common/monsters/monster/wyvern.qh b/qcsrc/common/monsters/monster/wyvern.qh
index ed89b9785daa98f3802b060a7b880186326a9fb1..2f2fc95bc9c1c3857721d3b5c4b4d40f1cb3a84e 100644 (file)
--- a/qcsrc/common/monsters/monster/wyvern.qh
+++ b/qcsrc/common/monsters/monster/wyvern.qh
@@ -14,7 +14,7 @@ CLASS(Wyvern, Monster)
     ATTRIB(Wyvern, m_model, Model, MDL_MON_WYVERN);
 #endif
     ATTRIB(Wyvern, netname, string, "wyvern");
-    ATTRIB(Wyvern, monster_name, string, _("Wyvern"));
+    ATTRIB(Wyvern, m_name, string, _("Wyvern"));
 ENDCLASS(Wyvern)
 
 REGISTER_MONSTER(WYVERN, NEW(Wyvern));

diff --git a/qcsrc/common/monsters/monster/zombie.qh b/qcsrc/common/monsters/monster/zombie.qh
index 1572a95ea0d34bd346cd0988604dc0fb029b682e..31b41c1f296c6e3278ec79fd5c1c527a066ef691 100644 (file)
--- a/qcsrc/common/monsters/monster/zombie.qh
+++ b/qcsrc/common/monsters/monster/zombie.qh
@@ -14,7 +14,7 @@ CLASS(Zombie, Monster)
     ATTRIB(Zombie, m_model, Model, MDL_MON_ZOMBIE);
 #endif
     ATTRIB(Zombie, netname, string, "zombie");
-    ATTRIB(Zombie, monster_name, string, _("Zombie"));
+    ATTRIB(Zombie, m_name, string, _("Zombie"));
 ENDCLASS(Zombie)
 
 REGISTER_MONSTER(ZOMBIE, NEW(Zombie));

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 4e53585ccc8490e1f672db9ad4831e437e1fa216..233f3ef40611da6665df309d0021cf82abe7d183 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -1459,8 +1459,8 @@ bool Monster_Spawn(entity this, bool check_appear, Monster mon)
        else
                setmodel(this, mon.m_model);
 
-       if(!this.monster_name || this.monster_name == "")
-               this.monster_name = mon.monster_name;
+       if(!this.m_name || this.m_name == "")
+               this.m_name = mon.m_name;
 
        if(this.statuseffects && this.statuseffects.owner == this)
        {

diff --git a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
index c9d4d9a733f2378bb0b3bc974e9b71e072cbc508..f3172c7110ece1c162dccf95bbc112884f5f7ce9 100644 (file)
--- a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
+++ b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
@@ -237,7 +237,7 @@ string spritelookuptext(entity this, string s)
     if (s == WP_RaceStartFinish.netname) return (race_checkpointtime || race_mycheckpointtime) ? _("Finish") : _("Start");
     if (s == WP_Weapon.netname) return REGISTRY_GET(Weapons, this.wp_extra).m_name;
     if (s == WP_Item.netname) return REGISTRY_GET(Items, this.wp_extra).m_waypoint;
-    if (s == WP_Monster.netname) return get_monsterinfo(this.wp_extra).monster_name;
+    if (s == WP_Monster.netname) return get_monsterinfo(this.wp_extra).m_name;
     if (MUTATOR_CALLHOOK(WP_Format, this, s))
     {
         return M_ARGV(3, string);

diff --git a/qcsrc/common/vehicles/vehicle.qh b/qcsrc/common/vehicles/vehicle.qh
index 682d52060d821cee7eff7956d1bf29c91d82a1d6..b812ce9a8d88bd679f71b464bbb7c93aa425532f 100644 (file)
--- a/qcsrc/common/vehicles/vehicle.qh
+++ b/qcsrc/common/vehicles/vehicle.qh
@@ -7,7 +7,7 @@ CLASS(Vehicle, Object)
     /** short name */
     ATTRIB(Vehicle, netname, string, "");
     /** human readable name */
-    ATTRIB(Vehicle, vehicle_name, string, _("Vehicle"));
+    ATTRIB(Vehicle, m_name, string, _("Vehicle"));
     /** color */
     ATTRIB(Vehicle, m_color, vector, '1 1 1');
     /** full name of model */

diff --git a/qcsrc/common/vehicles/vehicle/bumblebee.qh b/qcsrc/common/vehicles/vehicle/bumblebee.qh
index d71dcd6c3f7d18a75fc1a0fe114f30a5c0e0385b..800fd1e58e005b0e0805dd89aab6663f67ebca05 100644 (file)
--- a/qcsrc/common/vehicles/vehicle/bumblebee.qh
+++ b/qcsrc/common/vehicles/vehicle/bumblebee.qh
@@ -18,7 +18,7 @@ CLASS(Bumblebee, Vehicle)
 /* tags       */ ATTRIB(Bumblebee, tag_view, string, "tag_viewport");
 #endif
 /* netname    */ ATTRIB(Bumblebee, netname, string, "bumblebee");
-/* fullname   */ ATTRIB(Bumblebee, vehicle_name, string, _("Bumblebee"));
+/* fullname   */ ATTRIB(Bumblebee, m_name, string, _("Bumblebee"));
 /* icon       */ ATTRIB(Bumblebee, m_icon, string, "vehicle_bumble");
 ENDCLASS(Bumblebee)
 REGISTER_VEHICLE(BUMBLEBEE, NEW(Bumblebee));

diff --git a/qcsrc/common/vehicles/vehicle/racer.qh b/qcsrc/common/vehicles/vehicle/racer.qh
index e87d1714bf34d7050d89a586162aaeafa9a9ea57..1840aeea6785db3ddf7171ea0274f88aa481fe7a 100644 (file)
--- a/qcsrc/common/vehicles/vehicle/racer.qh
+++ b/qcsrc/common/vehicles/vehicle/racer.qh
@@ -18,7 +18,7 @@ CLASS(Racer, Vehicle)
 /* tags       */ ATTRIB(Racer, tag_view, string, "tag_viewport");
 #endif
 /* netname    */ ATTRIB(Racer, netname, string, "racer");
-/* fullname   */ ATTRIB(Racer, vehicle_name, string, _("Racer"));
+/* fullname   */ ATTRIB(Racer, m_name, string, _("Racer"));
 /* icon       */ ATTRIB(Racer, m_icon, string, "vehicle_racer");
 ENDCLASS(Racer)
 REGISTER_VEHICLE(RACER, NEW(Racer));

diff --git a/qcsrc/common/vehicles/vehicle/raptor.qh b/qcsrc/common/vehicles/vehicle/raptor.qh
index 2532a9cbe969984dc6dd4ebcbdb32ed49af2d250..e7e56a7e050941ae48512267c152c75339d58dfb 100644 (file)
--- a/qcsrc/common/vehicles/vehicle/raptor.qh
+++ b/qcsrc/common/vehicles/vehicle/raptor.qh
@@ -18,7 +18,7 @@ CLASS(Raptor, Vehicle)
 /* tags       */ ATTRIB(Raptor, tag_view, string, "tag_camera");
 #endif
 /* netname    */ ATTRIB(Raptor, netname, string, "raptor");
-/* fullname   */ ATTRIB(Raptor, vehicle_name, string, _("Raptor"));
+/* fullname   */ ATTRIB(Raptor, m_name, string, _("Raptor"));
 /* icon       */ ATTRIB(Raptor, m_icon, string, "vehicle_raptor");
 ENDCLASS(Raptor)
 REGISTER_VEHICLE(RAPTOR, NEW(Raptor));

diff --git a/qcsrc/common/vehicles/vehicle/spiderbot.qh b/qcsrc/common/vehicles/vehicle/spiderbot.qh
index 8301cd60754a8fa55e2b105b5e6832be0577617d..96e53ff7322b76a029aea903c6f50e148f10ee75 100644 (file)
--- a/qcsrc/common/vehicles/vehicle/spiderbot.qh
+++ b/qcsrc/common/vehicles/vehicle/spiderbot.qh
@@ -18,7 +18,7 @@ CLASS(Spiderbot, Vehicle)
 /* tags       */ ATTRIB(Spiderbot, tag_view, string, "");
 #endif
 /* netname    */ ATTRIB(Spiderbot, netname, string, "spiderbot");
-/* fullname   */ ATTRIB(Spiderbot, vehicle_name, string, _("Spiderbot"));
+/* fullname   */ ATTRIB(Spiderbot, m_name, string, _("Spiderbot"));
 /* icon       */ ATTRIB(Spiderbot, m_icon, string, "vehicle_spider");
 ENDCLASS(Spiderbot)
 

diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc
index 71da040ed31f204ae3be49d7e46696d6b1365b0d..a197312c51a9046561b102e14c24a1010f7a40b3 100644 (file)
--- a/qcsrc/server/command/common.qc
+++ b/qcsrc/server/command/common.qc
@@ -341,11 +341,11 @@ void CommonCommand_editmob(int request, entity caller, int argc)
                                        if (mon.realowner != caller && autocvar_g_monsters_edit < 2) { print_to(caller, "This monster does not belong to you"); return; }
                                        if (!is_visible) { print_to(caller, "You must look at your monster to edit it"); return; }
 
-                                       string mon_oldname = mon.monster_name;
+                                       string mon_oldname = mon.m_name;
 
-                                       mon.monster_name = argument;
+                                       mon.m_name = argument;
                                        if (mon.sprite)   WaypointSprite_UpdateSprites(mon.sprite, WP_Monster, WP_Null, WP_Null); // TODO: the new name is never actually sent to CSQC!
-                                       print_to(caller, sprintf("Your pet '%s' is now known as '%s'", mon_oldname, mon.monster_name));
+                                       print_to(caller, sprintf("Your pet '%s' is now known as '%s'", mon_oldname, mon.m_name));
                                        return;
                                }
                                case "spawn":
@@ -386,7 +386,7 @@ void CommonCommand_editmob(int request, entity caller, int argc)
                                        totalspawned += 1;
                                        WarpZone_TraceBox(CENTER_OR_VIEWOFS(caller), caller.mins, caller.maxs, CENTER_OR_VIEWOFS(caller) + v_forward * 150, true, caller);
                                        mon = spawnmonster(spawn(), arg_lower, MON_Null, caller, caller, trace_endpos, false, false, moveflag);
-                                       print_to(caller, strcat("Spawned ", mon.monster_name));
+                                       print_to(caller, strcat("Spawned ", mon.m_name));
                                        return;
                                }
                                case "kill":
@@ -396,7 +396,7 @@ void CommonCommand_editmob(int request, entity caller, int argc)
                                        if (!is_visible) { print_to(caller, "You must look at your monster to edit it"); return; }
 
                                        Damage(mon, NULL, NULL, GetResource(mon, RES_HEALTH) + mon.max_health + 200, DEATH_KILL.m_id, DMG_NOWEP, mon.origin, '0 0 0');
-                                       print_to(caller, strcat("Your pet '", mon.monster_name, "' has been brutally mutilated"));
+                                       print_to(caller, strcat("Your pet '", mon.m_name, "' has been brutally mutilated"));
                                        return;
                                }
                                case "skin":