Merge branch 'master' into TimePath/issues/1490
authorMario <zacjardine@y7mail.com>
Fri, 21 Aug 2015 06:00:56 +0000 (16:00 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Fri, 21 Aug 2015 06:11:52 +0000 (16:11 +1000)
# Conflicts:
# qcsrc/server/mutators/mutator_instagib.qc
# qcsrc/server/t_items.qc

12 files changed:
1  2 
qcsrc/client/hud.qc
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/physics.qc
qcsrc/common/weapons/w_porto.qc
qcsrc/server/cl_client.qc
qcsrc/server/g_damage.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/gamemode_lms.qc
qcsrc/server/mutators/mutator_instagib.qc
qcsrc/server/mutators/mutator_nades.qc
qcsrc/server/t_items.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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;
@@@ -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;
                        }