Merge branch 'sev/menu_headers' into 'master'

Sev/menu headers

This branch makes the style of menu headers editable in skinfiles.
It also removes a lot of redundancy by moving the initialization of the header labels into a dedicated function.

Default values have been added to existing skinfiles.

See merge request !55

diff --git a/balance-xpm.cfg b/balance-xpm.cfg
index d12637da71f3478ccc92321c66f616f00310dc2e..c254bcdf8d5118efd4b5f1aec0d687c609c63388 100644 (file)
--- a/balance-xpm.cfg
+++ b/balance-xpm.cfg
@@ -188,7 +188,7 @@ set g_maxpushtime 8.0 "timeout for kill credit when your damage knocks someone i
 // }}}
 
 // {{{ powerups
-set g_balance_powerup_invincible_takedamage 0.33 // only 1/3th damage is taken
+set g_balance_powerup_invincible_takedamage 0.33 // only 1/3rd damage is taken
 set g_balance_powerup_invincible_time 30
 set g_balance_powerup_strength_damage 3
 set g_balance_powerup_strength_force 3

diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc
index 54c51b3a01d22e7ada532048f77c72f96bb824db..fc769408bdf584d785a0fa0f5dd1cdb0d71ed45e 100644 (file)
--- a/qcsrc/client/weapons/projectile.qc
+++ b/qcsrc/client/weapons/projectile.qc
@@ -45,7 +45,6 @@ void Projectile_DrawTrail(vector to)
        }
 }
 
-.float proj_time;
 void Projectile_Draw()
 {
        vector rot;
@@ -54,9 +53,6 @@ void Projectile_Draw()
        float drawn;
        float t;
        float a;
-       float dt = time - self.proj_time;
-
-       self.proj_time = time;
 
        f = self.move_flags;
 
@@ -143,7 +139,6 @@ void Projectile_Draw()
        if(Nade_IDFromProjectile(self.cnt) != 0)
                trailorigin += v_up * 4;
 
-       if(dt > 0)
        if(drawn)
                Projectile_DrawTrail(trailorigin);
        else
@@ -204,7 +199,6 @@ void Ent_Projectile()
        self.count = (f & 0x80);
        self.iflags = (self.iflags & IFLAG_INTERNALMASK) | IFLAG_AUTOANGLES | IFLAG_ANGLES | IFLAG_ORIGIN;
        self.solid = SOLID_TRIGGER;
-       self.proj_time = time;
        //self.effects = EF_NOMODELFLAGS;
 
        // this should make collisions with bmodels more exact, but it leads to

diff --git a/qcsrc/server/weapons/accuracy.qc b/qcsrc/server/weapons/accuracy.qc
index 09d42332ae51dbf408a4284fdbd7b947f0fb517b..8a7f4c5b061d76d93d29984777bc9f4881df60f3 100644 (file)
--- a/qcsrc/server/weapons/accuracy.qc
+++ b/qcsrc/server/weapons/accuracy.qc
@@ -110,6 +110,7 @@ float accuracy_isgooddamage(entity attacker, entity targ)
 
        if(!warmup_stage)
        if(targ.deadflag == DEAD_NO)
+       if(!targ.frozen)
        if(mutator_check == MUT_ACCADD_INVALID || (mutator_check == MUT_ACCADD_VALID && IS_CLIENT(targ)))
        if(DIFF_TEAM(attacker, targ))
                return TRUE;

diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc
index 755ab59e593e4906319debced03fd205fb16ca8e..55e6d5415e154bf583c1f5892c485a336aea40b8 100644 (file)
--- a/qcsrc/server/weapons/tracing.qc
+++ b/qcsrc/server/weapons/tracing.qc
@@ -290,7 +290,7 @@ void FireRailgunBullet (vector start, vector end, float bdamage, float bforce, f
                f = ExponentialFalloff(mindist, maxdist, halflifedist, ent.railgundistance);
                ffs = ExponentialFalloff(mindist, maxdist, forcehalflifedist, ent.railgundistance);
 
-               if(accuracy_isgooddamage(self.realowner, ent))
+               if(accuracy_isgooddamage(self, ent))
                        totaldmg += bdamage * f;
 
                // apply the damage