From: Rudolf Polzer Date: Mon, 15 Aug 2011 05:10:01 +0000 (+0200) Subject: entirely remove UpdateCSQCProjectileNextFrame X-Git-Tag: xonotic-v0.5.0~148^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=729d8931e8261ebce2ce18c7ef7e2709cbaf2293;p=xonotic%2Fxonotic-data.pk3dir.git entirely remove UpdateCSQCProjectileNextFrame why was this there in the first place (nexuiz svn r6197 added this, but also did other fixes - possibly these other fixes alone had already sufficed) --- diff --git a/qcsrc/server/csqcprojectile.qc b/qcsrc/server/csqcprojectile.qc index 31e5b7788..d5b6697f2 100644 --- a/qcsrc/server/csqcprojectile.qc +++ b/qcsrc/server/csqcprojectile.qc @@ -103,25 +103,3 @@ void UpdateCSQCProjectileAfterTeleport(entity e) e.SendFlags |= 0x08; } } - -.void(void) csqcprojectile_oldthink; -.float csqcprojectile_oldnextthink; - -void CSQCProjectile_Update_Think() -{ - UpdateCSQCProjectile(self); - self.think = self.csqcprojectile_oldthink; - self.nextthink = max(time, self.csqcprojectile_oldnextthink); -} - -void UpdateCSQCProjectileNextFrame(entity e) -{ - if(e.SendEntity == CSQCProjectile_SendEntity) - if(e.think != CSQCProjectile_Update_Think) - { - e.csqcprojectile_oldthink = e.think; - e.csqcprojectile_oldnextthink = e.nextthink; - e.think = CSQCProjectile_Update_Think; - e.nextthink = time; - } -} diff --git a/qcsrc/server/csqcprojectile.qh b/qcsrc/server/csqcprojectile.qh index f569279e4..e00c0988b 100644 --- a/qcsrc/server/csqcprojectile.qh +++ b/qcsrc/server/csqcprojectile.qh @@ -3,5 +3,4 @@ void CSQCProjectile(entity e, float clientanimate, float type, float docull); void UpdateCSQCProjectile(entity e); void UpdateCSQCProjectileAfterTeleport(entity e); -void UpdateCSQCProjectileNextFrame(entity e); void CSQCProjectile_Check(entity e); diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc index 52cfbf83c..1d2ee93b9 100644 --- a/qcsrc/server/w_grenadelauncher.qc +++ b/qcsrc/server/w_grenadelauncher.qc @@ -143,8 +143,6 @@ void W_Grenade_Touch2 (void) if (autocvar_g_balance_grenadelauncher_secondary_lifetime_bounce && self.gl_bouncecnt == 1) self.nextthink = time + autocvar_g_balance_grenadelauncher_secondary_lifetime_bounce; - UpdateCSQCProjectile(self); - } else if(autocvar_g_balance_grenadelauncher_secondary_type == 2 && (!other || (other.takedamage != DAMAGE_AIM && other.movetype == MOVETYPE_NONE))) // stick {