ka, tka: slightly optimise balls

Removing them from the area grid means they're not considered by any
collision code or findradius().

diff --git a/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc b/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc
index d81d05b3f19b3780d628014e3b827634e0ec91f7..e61edf85191e763a6ddebd13b95e6e1e2449085e 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc
+++ b/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc
@@ -62,7 +62,6 @@ void ka_RespawnBall(entity this) // runs whenever the ball needs to be relocated
        this.velocity = '0 0 200';
        this.angles = '0 0 0';
        this.effects = autocvar_g_keepawayball_effects;
-       settouch(this, ka_TouchEvent);
        setthink(this, ka_RespawnBall);
        this.nextthink = time + autocvar_g_keepawayball_respawntime;
        navigation_dynamicgoal_set(this, NULL);
@@ -152,13 +151,13 @@ void ka_TouchEvent(entity this, entity toucher) // runs any time that the ball c
        toucher.ballcarried = this;
        GameRules_scoring_vip(toucher, true);
        setattachment(this, toucher, "");
+       this.solid = SOLID_NOT; // before setorigin to ensure area grid unlinking
        setorigin(this, '0 0 0');
 
        // make the ball unable to do anything, set up time scoring
        this.velocity = '0 0 0';
        set_movetype(this, MOVETYPE_NONE);
        this.scale = 12/16; // somewhat smaller while carried
-       settouch(this, func_null);
        setthink(this, ka_BallThink_Carried);
        this.nextthink = time;
        this.takedamage = DAMAGE_NO;
@@ -203,7 +202,6 @@ void ka_DropEvent(entity player) // runs any time that a player is supposed to l
        set_movetype(ball, MOVETYPE_BOUNCE);
        ball.previous_owner = player;
        ball.wait = time + 0.5; // same as for thrown weapons
-       settouch(ball, ka_TouchEvent);
        setthink(ball, ka_RespawnBall);
        ball.nextthink = time + autocvar_g_keepawayball_respawntime;
        ball.takedamage = DAMAGE_YES;
@@ -212,6 +210,7 @@ void ka_DropEvent(entity player) // runs any time that a player is supposed to l
        IL_PUSH(g_damagedbycontents, ball);
        ball.scale = 1; // it's smaller while carried
        ball.alpha = 1; // in case the carrier had an invisibility effect
+       ball.solid = SOLID_TRIGGER; // before setorigin to ensure area grid linking
        setorigin(ball, player.origin + ball.origin + '0 0 10'); // include attachment offset to reduce jump
        nudgeoutofsolid_OrFallback(ball); // a ball has a horizontally bigger bbox than a player
        ball.velocity = '0 0 200' + '0 100 0'*crandom() + '100 0 0'*crandom();

diff --git a/qcsrc/common/gamemodes/gamemode/tka/sv_tka.qc b/qcsrc/common/gamemodes/gamemode/tka/sv_tka.qc
index 36ee08fd8b1eadf25e91b76f2aa9afbdad6e546d..7bb60c93e902033558345ca9e63a486b8a7ebcf0 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/tka/sv_tka.qc
+++ b/qcsrc/common/gamemodes/gamemode/tka/sv_tka.qc
@@ -59,7 +59,6 @@ void tka_RespawnBall(entity this) // runs whenever the ball needs to be relocate
        this.velocity = '0 0 200';
        this.angles = '0 0 0';
        this.effects = autocvar_g_tkaball_effects;
-       settouch(this, tka_TouchEvent);
        setthink(this, tka_RespawnBall);
        this.nextthink = time + autocvar_g_tkaball_respawntime;
        navigation_dynamicgoal_set(this, NULL);
@@ -143,13 +142,13 @@ void tka_TouchEvent(entity this, entity toucher) // runs any time that the ball
        toucher.ballcarried = this;
        GameRules_scoring_vip(toucher, true);
        setattachment(this, toucher, "");
+       this.solid = SOLID_NOT; // before setorigin to ensure area grid unlinking
        setorigin(this, '0 0 0');
 
        // make the ball unable to do anything, set up time scoring
        this.velocity = '0 0 0';
        set_movetype(this, MOVETYPE_NONE);
        this.scale = 12/16; // somewhat smaller while carried
-       settouch(this, func_null);
        setthink(this, tka_BallThink_Carried);
        this.nextthink = time;
        this.takedamage = DAMAGE_NO;
@@ -201,12 +200,12 @@ void tka_DropEvent(entity player) // runs any time that a player is supposed to
        set_movetype(ball, MOVETYPE_BOUNCE);
        ball.previous_owner = player;
        ball.wait = time + 0.5; // same as for thrown weapons
-       settouch(ball, tka_TouchEvent);
        setthink(ball, tka_RespawnBall);
        ball.nextthink = time + autocvar_g_tkaball_respawntime;
        ball.takedamage = DAMAGE_YES;
        ball.scale = 1; // it's smaller while carried
        ball.alpha = 1; // in case the carrier had an invisibility effect
+       ball.solid = SOLID_TRIGGER; // before setorigin to ensure area grid linking
        setorigin(ball, player.origin + ball.origin + '0 0 10'); // include attachment offset to reduce jump
        nudgeoutofsolid_OrFallback(ball); // a ball has a horizontally bigger bbox than a player
        ball.velocity = '0 0 200' + '0 100 0'*crandom() + '100 0 0'*crandom();