From: Mario <zacjardine@y7mail.com>
Date: Fri, 21 Aug 2015 06:00:56 +0000 (+1000)
Subject: Merge branch 'master' into TimePath/issues/1490
X-Git-Tag: xonotic-v0.8.2~2063^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bc996d1cf2bb0de381c06a2ad07bed5d333e3e84;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into TimePath/issues/1490

# Conflicts:
#	qcsrc/server/mutators/mutator_instagib.qc
#	qcsrc/server/t_items.qc
---

bc996d1cf2bb0de381c06a2ad07bed5d333e3e84
diff --cc qcsrc/server/mutators/mutator_instagib.qc
index 000eaa588,4c384c0e9..e71f49265
--- a/qcsrc/server/mutators/mutator_instagib.qc
+++ b/qcsrc/server/mutators/mutator_instagib.qc
@@@ -290,7 -290,7 +290,7 @@@ MUTATOR_HOOKFUNCTION(instagib_PlayerDam
  		frag_mirrordamage = 0;
  	}
  
- 	if((frag_target.buffs & BUFF_INVISIBLE) || (frag_target.items & ITEM_Strength.m_itemid))
 -	if((frag_target.buffs & BUFF_INVISIBLE.m_itemid) || (frag_target.items & IT_STRENGTH))
++	if((frag_target.buffs & BUFF_INVISIBLE.m_itemid) || (frag_target.items & ITEM_Strength.m_itemid))
  		yoda = 1;
  
  	return false;
diff --cc qcsrc/server/t_items.qc
index 459e68a93,aa0e83065..7d173d73a
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@@ -629,18 -629,18 +629,18 @@@ void Item_RespawnCountdown (void
  			string name;
  			vector rgb = '1 0 1';
  			name = string_null;
 -			switch(self.items)
 +			switch (self.items)
  			{
 -				case IT_FUEL_REGEN: name = "item-fuelregen"; rgb = '1 0.5 0'; break;
 -				case IT_JETPACK:    name = "item-jetpack"; rgb = '0.5 0.5 0.5'; break;
 -				case IT_STRENGTH:   name = "item-strength"; rgb = '0 0 1'; break;
 -				case IT_INVINCIBLE: name = "item-shield"; rgb = '1 0 1'; break;
 -				case IT_HEALTH:
 -					// if(self.itemdef == ITEM_HealthMega)
 +				case ITEM_JetpackRegen.m_itemid: name = "item-fuelregen"; rgb = '1 0.5 0'; break;
 +				case ITEM_Jetpack.m_itemid:    name = "item-jetpack"; rgb = '0.5 0.5 0.5'; break;
 +				case ITEM_Strength.m_itemid:   name = "item-strength"; rgb = '0 0 1'; break;
 +				case ITEM_Shield.m_itemid: name = "item-shield"; rgb = '1 0 1'; break;
 +				case ITEM_HealthMega.m_itemid:
 +					//if (self.classname == "item_health_mega")
  						{name = "item_health_mega"; rgb = '1 0 0';}
  					break;
 -				case IT_ARMOR:
 -					if(self.itemdef == ITEM_ArmorLarge)
 +				case ITEM_ArmorMega.m_itemid:
- 					if (self.classname == "item_armor_large")
++					if (self.itemdef == ITEM_ArmorLarge)
  						{name = "item_armor_large"; rgb = '0 1 0';}
  					break;
  			}