Remove now redundantly assigned classnames

diff --git a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
index 5a0ff2a2c22ade90150d22cad3fbcfdb8be07f3b..eec3248215f321a344913998e5b7fda6d0a83e45 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
+++ b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
@@ -589,7 +589,6 @@ void SpawnBall(entity this)
 spawnfunc(nexball_basketball)
 {
        nexball_mode |= NBM_BASKETBALL;
-       this.classname = "nexball_basketball";
        if (!(balls & BALL_BASKET))
        {
                /*
@@ -613,7 +612,6 @@ spawnfunc(nexball_basketball)
 spawnfunc(nexball_football)
 {
        nexball_mode |= NBM_FOOTBALL;
-       this.classname = "nexball_football";
        this.solid = SOLID_TRIGGER;
        balls |= BALL_FOOT;
        this.pushable = autocvar_g_nexball_football_jumppad;

diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
index 0150de3925ee90072b040e2f5d132cd301a736ad..6d1968ef10723a9e27fa9e6dddd13e5b45a81a3d 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
+++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
@@ -1036,7 +1036,6 @@ void ons_GeneratorSetup(entity gen) // called when spawning a generator entity o
        ons_worldgeneratorlist = gen;
 
        gen.netname = sprintf("%s generator", Team_ColoredFullName(teamnumber));
-       gen.classname = "onslaught_generator";
        gen.solid = SOLID_BBOX;
        gen.team_saved = teamnumber;
        IL_PUSH(g_saved_team, gen);

diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index 1a2e92c4ff4b146203198c698cea6ff48bd4b049..08076ed2e98daa3b2294397a199d357da1b73d60 100644 (file)
--- a/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@ -1529,7 +1529,7 @@ spawnfunc(item_invincible)
 }
 
 // compatibility:
-spawnfunc(item_quad) { this.classname = "item_strength";spawnfunc_item_strength(this);}
+spawnfunc(item_quad) { spawnfunc_item_strength(this);}
 
 void target_items_use(entity this, entity actor, entity trigger)
 {

diff --git a/qcsrc/common/triggers/misc/teleport_dest.qc b/qcsrc/common/triggers/misc/teleport_dest.qc
index fc3cec863a26920d0547df1143e75af283631f88..ea82f82e8424a64f22a3734d552f620363caae8d 100644 (file)
--- a/qcsrc/common/triggers/misc/teleport_dest.qc
+++ b/qcsrc/common/triggers/misc/teleport_dest.qc
@@ -33,8 +33,6 @@ void teleport_dest_link(entity this)
 
 spawnfunc(info_teleport_destination)
 {
-       this.classname = "info_teleport_destination";
-
        this.mangle = this.angles;
        this.angles = '0 0 0';
 

diff --git a/qcsrc/common/triggers/target/kill.qc b/qcsrc/common/triggers/target/kill.qc
index a821ac1393724ace54a18286c8e22aa6cb8f59ca..f37c66b0f0500ddb94f3e914602e0fb0d5555a79 100644 (file)
--- a/qcsrc/common/triggers/target/kill.qc
+++ b/qcsrc/common/triggers/target/kill.qc
@@ -15,8 +15,6 @@ void target_kill_use(entity this, entity actor, entity trigger)
 
 spawnfunc(target_kill)
 {
-    this.classname = "target_kill";
-
     if (this.message == "")
                this.message = "was in the wrong place";
 

diff --git a/qcsrc/common/triggers/target/location.qc b/qcsrc/common/triggers/target/location.qc
index 5774f45f993c183bf19712391b5f877eac24daf4..c673308a6c02349a381d4450e8df58df56800162 100644 (file)
--- a/qcsrc/common/triggers/target/location.qc
+++ b/qcsrc/common/triggers/target/location.qc
@@ -4,7 +4,6 @@ void target_push_init(entity this);
 
 spawnfunc(target_location)
 {
-    this.classname = "target_location";
     // location name in netname
     // eventually support: count, teamgame selectors, line of sight?
 

diff --git a/qcsrc/common/triggers/trigger/secret.qc b/qcsrc/common/triggers/trigger/secret.qc
index c3c2c7474e6983b071464d04cc59ea45bbb47c1f..0759179dc13aa60c0903a996afd5c905faa7fdb1 100644 (file)
--- a/qcsrc/common/triggers/trigger/secret.qc
+++ b/qcsrc/common/triggers/trigger/secret.qc
@@ -78,7 +78,6 @@ spawnfunc(trigger_secret)
        this.delay = 0;
 
        // convert this trigger to trigger_once
-       //this.classname = "trigger_once";
        spawnfunc_trigger_once(this);
 
        // take over the touch() function, so we can mark secret as found

diff --git a/qcsrc/common/triggers/trigger/viewloc.qc b/qcsrc/common/triggers/trigger/viewloc.qc
index ffc04a0782bf8d0a5b59c00876adf0b8319dc078..198b18a3353343ce51e276bf6b9e6788fa15f68c 100644 (file)
--- a/qcsrc/common/triggers/trigger/viewloc.qc
+++ b/qcsrc/common/triggers/trigger/viewloc.qc
@@ -119,13 +119,11 @@ void viewloc_link(entity this)
 
 spawnfunc(target_viewlocation_start)
 {
-       this.classname = "target_viewlocation_start";
        this.cnt = 1;
        viewloc_link(this);
 }
 spawnfunc(target_viewlocation_end)
 {
-       this.classname = "target_viewlocation_end";
        this.cnt = 2;
        viewloc_link(this);
 }

diff --git a/qcsrc/common/turrets/checkpoint.qc b/qcsrc/common/turrets/checkpoint.qc
index f5ba71477982d4ec6b727d1312aaf36633269a1c..73266183523bac554089adbec7966e7a575208cb 100644 (file)
--- a/qcsrc/common/turrets/checkpoint.qc
+++ b/qcsrc/common/turrets/checkpoint.qc
@@ -75,7 +75,6 @@ spawnfunc(turret_checkpoint)
 // Compat.
 spawnfunc(walker_checkpoint)
 {
-    this.classname = "turret_checkpoint";
     spawnfunc_turret_checkpoint(this);
 }
 

diff --git a/qcsrc/server/item_key.qc b/qcsrc/server/item_key.qc
index c645c7facdce7515e3021c441bb586fdbfd1375a..f0a01f6b0a14954c1ae4542c95346b948e72d722 100644 (file)
--- a/qcsrc/server/item_key.qc
+++ b/qcsrc/server/item_key.qc
@@ -261,7 +261,6 @@ Don't use this entity on new maps! Use item_key instead.
 */
 spawnfunc(item_key1)
 {
-       this.classname = "item_key";
        this.itemkeys = ITEM_KEY_BIT(1);
        spawnfunc_item_key(this);
 };
@@ -280,7 +279,6 @@ Don't use this entity on new maps! Use item_key instead.
 */
 spawnfunc(item_key2)
 {
-       this.classname = "item_key";
        this.itemkeys = ITEM_KEY_BIT(0);
        spawnfunc_item_key(this);
 };

diff --git a/qcsrc/server/mutators/mutator/gamemode_assault.qc b/qcsrc/server/mutators/mutator/gamemode_assault.qc
index affa033de1da73e3082bd12b1c8925cf7ac85330..08f80f29e85b74bb3b44f75d8f83134d22ca46b6 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_assault.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_assault.qc
@@ -294,7 +294,6 @@ spawnfunc(target_objective)
 {
        if (!g_assault) { delete(this); return; }
 
-       this.classname = "target_objective";
        IL_PUSH(g_assault_objectives, this);
        this.use = assault_objective_use;
        this.reset = assault_objective_reset;
@@ -306,7 +305,6 @@ spawnfunc(target_objective_decrease)
 {
        if (!g_assault) { delete(this); return; }
 
-       this.classname = "target_objective_decrease";
        IL_PUSH(g_assault_objectivedecreasers, this);
 
        if(!this.dmg)
@@ -327,7 +325,6 @@ spawnfunc(func_assault_destructible)
        if (!g_assault) { delete(this); return; }
 
        this.spawnflags = 3;
-       this.classname = "func_assault_destructible";
        IL_PUSH(g_assault_destructibles, this);
 
        if(assault_attacker_team == NUM_TEAM_1)
@@ -342,7 +339,6 @@ spawnfunc(func_assault_wall)
 {
        if (!g_assault) { delete(this); return; }
 
-       this.classname = "func_assault_wall";
        this.mdl = this.model;
        _setmodel(this, this.mdl);
        this.solid = SOLID_BSP;
@@ -356,7 +352,6 @@ spawnfunc(target_assault_roundend)
        if (!g_assault) { delete(this); return; }
 
        this.winning = 0; // round not yet won by attackers
-       this.classname = "target_assault_roundend";
        this.use = target_assault_roundend_use;
        this.cnt = 0; // first round
        this.reset = target_assault_roundend_reset;
@@ -367,7 +362,6 @@ spawnfunc(target_assault_roundstart)
        if (!g_assault) { delete(this); return; }
 
        assault_attacker_team = NUM_TEAM_1;
-       this.classname = "target_assault_roundstart";
        this.use = assault_roundstart_use;
        this.reset2 = assault_roundstart_use_this;
        InitializeEntity(this, assault_roundstart_use_this, INITPRIO_FINDTARGET);

diff --git a/qcsrc/server/mutators/mutator/gamemode_ctf.qc b/qcsrc/server/mutators/mutator/gamemode_ctf.qc
index 3cf560ebedf752c3fc99b33cfc2aa3248bcaad2b..517c289e37d623f1b278c372a1cabf4474270e1c 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_ctf.qc
@@ -2625,7 +2625,6 @@ spawnfunc(ctf_team)
 {
        if(!g_ctf) { delete(this); return; }
 
-       this.classname = "ctf_team";
        this.team = this.cnt + 1;
 }
 

diff --git a/qcsrc/server/mutators/mutator/gamemode_domination.qc b/qcsrc/server/mutators/mutator/gamemode_domination.qc
index be38553c9588bcd4ba1bfd79042432f79aebd583..b4a51cc10c2056af4f480c383dcc45989ce14fca 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_domination.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_domination.qc
@@ -543,7 +543,6 @@ spawnfunc(dom_team)
                precache_sound(this.noise);
        if (this.noise1 != "")
                precache_sound(this.noise1);
-       this.classname = "dom_team";
        _setmodel(this, this.model); // precision not needed
        this.mdl = this.model;
        this.dmg = this.modelindex;
@@ -608,7 +607,6 @@ void dom_spawnteam (string teamname, float teamcolor, string pointmodel, float p
 void dom_spawnpoint(vector org)
 {
        entity e = spawn();
-       e.classname = "dom_controlpoint";
        setthink(e, spawnfunc_dom_controlpoint);
        e.nextthink = time;
        setorigin(e, org);

diff --git a/qcsrc/server/mutators/mutator/gamemode_invasion.qc b/qcsrc/server/mutators/mutator/gamemode_invasion.qc
index 1b8b77ae078158e566fb34a87c754701436175d3..ebc364ce30619db8c5983e5f5118af4aeb0db2df 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_invasion.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_invasion.qc
@@ -72,7 +72,6 @@ spawnfunc(invasion_spawnpoint)
 {
        if(!g_invasion) { delete(this); return; }
 
-       this.classname = "invasion_spawnpoint";
        IL_PUSH(g_invasion_spawns, this);
 }
 

diff --git a/qcsrc/server/mutators/mutator/gamemode_tdm.qc b/qcsrc/server/mutators/mutator/gamemode_tdm.qc
index aad31932884556dff7b4a7b6f1a186dcbf15e44c..94c5669e37231333d5ac6d126de9dd4575935c8e 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_tdm.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_tdm.qc
@@ -13,7 +13,6 @@ spawnfunc(tdm_team)
 {
        if(!g_tdm || !this.cnt) { delete(this); return; }
 
-       this.classname = "tdm_team";
        this.team = this.cnt + 1;
 }
 

diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc
index cd393b64196a1cbab9f0128623f3ef8be7adc612..84df4667ab7416232ec9a44b8b7a6a6d69c15f1a 100644 (file)
--- a/qcsrc/server/spawnpoints.qc
+++ b/qcsrc/server/spawnpoints.qc
@@ -168,7 +168,6 @@ spawnfunc(info_player_start)
 
 spawnfunc(info_player_deathmatch)
 {
-       this.classname = "info_player_deathmatch";
        IL_PUSH(g_spawnpoints, this);
        relocate_spawnpoint(this);
 }