X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_common.qc;h=9bae1b7ba720b3c476ead7f9980627fba21bfea6;hb=a53768f20ae1838a151d010919c8c4d4e4d47cc4;hp=a2f23956eed6f4f3f7b0389d523e8062555fb2d1;hpb=0fd8a5f77b5b6529fedbdfd00e192b1b1d0440ea;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/w_common.qc b/qcsrc/server/w_common.qc index a2f23956e..9bae1b7ba 100644 --- a/qcsrc/server/w_common.qc +++ b/qcsrc/server/w_common.qc @@ -11,7 +11,6 @@ void W_GiveWeapon (entity e, float wep, string name) oldself = self; self = e; - if not(g_minstagib) if (other.classname == "player") { sprint (other, "You got the ^2"); @@ -229,7 +228,7 @@ void W_BallisticBullet_LeaveSolid_think() self.think = self.W_BallisticBullet_LeaveSolid_think_save; self.nextthink = max(time, self.W_BallisticBullet_LeaveSolid_nextthink_save); - self.W_BallisticBullet_LeaveSolid_think_save = SUB_Null; + self.W_BallisticBullet_LeaveSolid_think_save = func_null; self.flags &~= FL_ONGROUND; @@ -339,7 +338,7 @@ float W_BallisticBullet_LeaveSolid(float eff) void W_BallisticBullet_Touch (void) { - float density; + //float density; if(self.think == W_BallisticBullet_LeaveSolid_think) // skip this! return; @@ -400,7 +399,7 @@ void fireBallisticBullet_trace_callback(vector start, vector hit, vector end) void fireBallisticBullet(vector start, vector dir, float spread, float pSpeed, float lifetime, float damage, float headshotbonus, float force, float dtype, float tracereffects, float gravityfactor, float bulletconstant) { - float lag, dt, savetime, density; + float lag, dt, savetime; //, density; entity pl, oldself; float antilagging; @@ -628,7 +627,7 @@ float W_CheckProjectileDamage(entity inflictor, entity projowner, float deathtyp void W_PrepareExplosionByDamage(entity attacker, void() explode) { self.takedamage = DAMAGE_NO; - self.event_damage = SUB_Null; + self.event_damage = func_null; if((attacker.flags & FL_CLIENT) && !autocvar_g_projectiles_keep_owner) {