Merge branch 'master' into terencehill/accuracy_shotgun

# Conflicts:
#	qcsrc/common/weapons/weapon/hagar.qc
#	qcsrc/server/player.qc
#	qcsrc/server/weapons/tracing.qc

diff --cc qcsrc/common/mutators/mutator/nades/nades.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/hagar.qc
index 026ad6ad8a5007d957419e5f8dcc04dc47f217a0,bbd3ddb4efbd2efd081a257bf43ea6ff19566e3b..d9164dc19ab6c999534cf72f868801f2750b466a
--- 1/qcsrc/common/weapons/weapon/hagar.qc
--- 2/qcsrc/common/weapons/weapon/hagar.qc
+++ b/qcsrc/common/weapons/weapon/hagar.qc
@@@ -181,8 -183,7 +183,8 @@@ void W_Hagar_Attack2_Load_Release(entit
  
        weapon_prepareattack_do(actor, weaponentity, true, WEP_CVAR_SEC(hagar, refire));
  
 -      W_SetupShot(actor, weaponentity, false, 2, SND_HAGAR_FIRE, CH_WEAPON_A, WEP_CVAR_SEC(hagar, damage), WEP_HAGAR.m_id | HITTYPE_SECONDARY);
 +      shots = actor.(weaponentity).hagar_load;
-       W_SetupShot(actor, weaponentity, false, 2, SND_HAGAR_FIRE, CH_WEAPON_A, WEP_CVAR_SEC(hagar, damage) * shots);
++      W_SetupShot(actor, weaponentity, false, 2, SND_HAGAR_FIRE, CH_WEAPON_A, WEP_CVAR_SEC(hagar, damage) * shots, WEP_HAGAR.m_id | HITTYPE_SECONDARY);
        Send_Effect(EFFECT_HAGAR_MUZZLEFLASH, w_shotorg, w_shotdir * 1000, 1);
  
        forward = v_forward;

diff --cc qcsrc/server/client.qc
Simple merge

diff --cc qcsrc/server/defs.qh
index 6b626a74eb09f117ae914469dfca92f935111ecb,060e1ce55aacb5f83618426b0fcbc599772124d7..4b600e3fceeab8743b14388eae44ba48c55c0d09
--- 1/qcsrc/server/defs.qh
--- 2/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@@ -367,10 -364,8 +364,9 @@@ const float ACTIVE_TOGGLE         = 3
  
  .float player_blocked;
  
- .float revive_progress = _STAT(REVIVE_PROGRESS);
  .float revival_time; // time at which player was last revived
  .float revive_speed; // NOTE: multiplier (anything above 1 is instaheal)
 +.float freeze_time;
  .entity iceblock;
  .entity frozen_by; // for ice fields
  

diff --cc qcsrc/server/g_damage.qc
index 713cf385dccc4387f6283b34433f064ea177cf55,804d9fd713d8bae506df76f137b2fe546af58892..3fb000e708072a5af331a984f1d0563ef5afac99
--- 1/qcsrc/server/g_damage.qc
--- 2/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@@ -532,9 -529,9 +529,9 @@@ void Freeze (entity targ, float revives
        float targ_maxhealth = ((IS_MONSTER(targ)) ? targ.max_health : start_health);
  
        STAT(FROZEN, targ) = frozen_type;
-       targ.revive_progress = ((frozen_type == 3) ? 1 : 0);
+       STAT(REVIVE_PROGRESS, targ) = ((frozen_type == 3) ? 1 : 0);
        SetResourceAmount(targ, RESOURCE_HEALTH, ((frozen_type == 3) ? targ_maxhealth : 1));
 -      targ.revive_speed = freeze_time;
 +      targ.revive_speed = revivespeed;
        if(targ.bot_attack)
                IL_REMOVE(g_bot_targets, targ);
        targ.bot_attack = false;

diff --cc qcsrc/server/player.qc
index 9d9281c0e9eb079298e25f4e08010298a9599aa8,af6b520749f3b157434d443bc056690f32602b33..88acd12f979522b3849813ac39064d3972222664
--- 1/qcsrc/server/player.qc
--- 2/qcsrc/server/player.qc
+++ b/qcsrc/server/player.qc
@@@ -655,7 -652,7 +654,7 @@@ void PlayerDamage(entity this, entity i
                if(autocvar_sv_gentle > 0 || autocvar_ekg || this.classname == "body") {
                        // remove corpse
                        // clones don't run any animation code any more, so we must gib them when they die :(
-                       this.event_damage(this, inflictor, attacker, autocvar_sv_gibhealth + 1, deathtype, hitloc, force);
 -                      PlayerCorpseDamage(this, inflictor, attacker, autocvar_sv_gibhealth+1.0, deathtype, weaponentity, hitloc, force);
++                      this.event_damage(this, inflictor, attacker, autocvar_sv_gibhealth + 1, deathtype, weaponentity, hitloc, force);
                }
  
                // reset fields the weapons may use just in case

diff --cc qcsrc/server/weapons/accuracy.qc
Simple merge

diff --cc qcsrc/server/weapons/tracing.qc
index 87330e79970d32415724d51d18b15f093b9c0436,772809d658dde2d8ad7c95bdbce39077634cf06b..8501e5186deea6ece233d94113104add0d5b5012
--- 1/qcsrc/server/weapons/tracing.qc
--- 2/qcsrc/server/weapons/tracing.qc
+++ b/qcsrc/server/weapons/tracing.qc
@@@ -422,10 -418,10 +418,10 @@@ void fireBullet(entity this, .entity we
                        yoda = 0;
                        MUTATOR_CALLHOOK(FireBullet_Hit, this, hit, start, end, damage, this.(weaponentity));
                        damage = M_ARGV(4, float);
 -                      float g = accuracy_isgooddamage(this, hit);
 +                      bool gooddamage = accuracy_isgooddamage(this, hit);
-                       Damage(hit, this, this, damage * solid_penetration_left, dtype, start, force * dir * solid_penetration_left);
+                       Damage(hit, this, this, damage * solid_penetration_left, dtype, weaponentity, start, force * dir * solid_penetration_left);
                        // calculate hits for ballistic weapons
 -                      if(g)
 +                      if(gooddamage)
                        {
                                // do not exceed 100%
                                float added_damage = min(damage - total_damage, damage * solid_penetration_left);