From: Mario <zacjardine@y7mail.com>
Date: Thu, 27 Nov 2014 08:54:09 +0000 (+1100)
Subject: Merge branch 'master' into Mario/weapons_new
X-Git-Tag: xonotic-v0.8.0~122^2~21
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3bc58a45f32841ecde5913aa899172e3093b63a6;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/weapons_new

Conflicts:
	qcsrc/client/View.qc
	qcsrc/common/stats.qh
	qcsrc/server/mutators/mutator_instagib.qc
---

3bc58a45f32841ecde5913aa899172e3093b63a6
diff --cc qcsrc/client/View.qc
index 8a5fff171,166ea07f0..1e2c7b770
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@@ -375,10 -374,12 +375,12 @@@ entity nightvision_noise, nightvision_n
  
  #define MAX_TIME_DIFF 5
  float pickup_crosshair_time, pickup_crosshair_size;
- float hit_time, typehit_time;
- float nextsound_hit_time, nextsound_typehit_time;
- float hitindication_crosshair_time, hitindication_crosshair_size;
+ float hitsound_time_prev;
+ float spectatee_status_prev; // for preventing hitsound when switching spectatee
+ float damage_dealt_total, damage_dealt_total_prev;
+ float typehit_time, typehit_time_prev;
+ float hitindication_crosshair_size;
 -float use_nex_chargepool;
 +float use_vortex_chargepool;
  
  float myhealth, myhealth_prev;
  float myhealth_flash;
diff --cc qcsrc/common/stats.qh
index 4b57447a3,f358069e2..d92977f2c
--- a/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@@ -52,11 -52,11 +52,11 @@@ const float STAT_SHOTOR
  const float STAT_LEADLIMIT              = 47;
  const float STAT_WEAPON_CLIPLOAD        = 48;
  const float STAT_WEAPON_CLIPSIZE        = 49;
 -const float STAT_NEX_CHARGE             = 50;
 +const float STAT_VORTEX_CHARGE          = 50;
  const float STAT_LAST_PICKUP            = 51;
  const float STAT_HUD                    = 52;
 -const float STAT_NEX_CHARGEPOOL         = 53;
 +const float STAT_VORTEX_CHARGEPOOL      = 53;
- const float STAT_HIT_TIME               = 54;
+ const float STAT_DAMAGE_DEALT_TOTAL     = 54;
  const float STAT_TYPEHIT_TIME           = 55;
  const float STAT_LAYED_MINES            = 56;
  const float STAT_HAGAR_LOAD             = 57;
diff --cc qcsrc/server/mutators/mutator_instagib.qc
index 4507e23c4,bd61023a1..dc822e274
--- a/qcsrc/server/mutators/mutator_instagib.qc
+++ b/qcsrc/server/mutators/mutator_instagib.qc
@@@ -245,25 -245,28 +245,25 @@@ MUTATOR_HOOKFUNCTION(instagib_PlayerDam
  		}
  
  		if(IS_PLAYER(frag_attacker))
 -		if(DEATH_ISWEAPON(frag_deathtype, WEP_MINSTANEX))
 -		if(frag_target.armorvalue)
 +		if(DEATH_ISWEAPON(frag_deathtype, WEP_VAPORIZER))
  		{
 -			frag_target.armorvalue -= 1;
 -			Send_Notification(NOTIF_ONE, frag_target, MSG_CENTER, CENTER_MINSTA_LIVES_REMAINING, frag_target.armorvalue);
 -			frag_damage = 0;
 -			frag_target.damage_dealt += 1;
 -			frag_attacker.damage_dealt += 1; // TODO change this to a future specific hitsound for armor hit
 -		}
 -
 -		if(IS_PLAYER(frag_attacker))
 -		if (DEATH_ISWEAPON(frag_deathtype, WEP_LASER))
 -		{
 -			frag_damage = 0;
 -			frag_mirrordamage = 0;
 -			if (frag_target != frag_attacker)
 +			if(frag_deathtype & HITTYPE_SECONDARY)
 +			{
 +				frag_damage = frag_mirrordamage = 0;
 +				
 +				if(frag_target != frag_attacker)
 +				{
 +					if(frag_target.health > 0) { Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_MINSTA_SECONDARY); }
 +					frag_force = '0 0 0';
 +				}
 +			}
 +			else if(frag_target.armorvalue)
  			{
 -				if (frag_target.health >= 1)
 -					Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_MINSTA_SECONDARY);
 -				frag_force = '0 0 0';
 -				// keep mirrorfrag_force
 -				//frag_attacker = frag_target;
 +				frag_target.armorvalue -= 1;
 +				frag_damage = 0;
- 				frag_target.hitsound += 1;
- 				frag_attacker.hitsound += 1; // TODO: change this to a specific hitsound for armor hit
++				frag_target.damage_dealt += 1;
++				frag_attacker.damage_dealt += 1; // TODO: change this to a specific hitsound for armor hit
 +				Send_Notification(NOTIF_ONE, frag_target, MSG_CENTER, CENTER_MINSTA_LIVES_REMAINING, frag_target.armorvalue);
  			}
  		}
  	}