]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
entirely remove UpdateCSQCProjectileNextFrame
authorRudolf Polzer <divverent@xonotic.org>
Mon, 15 Aug 2011 05:10:01 +0000 (07:10 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 15 Aug 2011 05:10:01 +0000 (07:10 +0200)
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)

qcsrc/server/csqcprojectile.qc
qcsrc/server/csqcprojectile.qh
qcsrc/server/w_grenadelauncher.qc

index 31e5b7788513b7eb180cd929c10d46bae871fc08..d5b6697f25932c34ca6936951f6283fd235f9acd 100644 (file)
@@ -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;
-       }
-}
index f569279e41983023e780d512440366947538cfc3..e00c0988b9d8c058b1d2b277048b3edbd7d2dd38 100644 (file)
@@ -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);
index 52cfbf83c932436ddd2e455bc1e837a34163b0c7..1d2ee93b9a2cfb8778d290f69f5071b0491b55ed 100644 (file)
@@ -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
        {