Merge branch 'master' into TimePath/debug_draw
authorTimePath <andrew.hardaker1995@gmail.com>
Thu, 29 Oct 2015 08:36:00 +0000 (19:36 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Thu, 29 Oct 2015 08:36:00 +0000 (19:36 +1100)
# Conflicts:
# qcsrc/common/items/inventory.qh

23 files changed:
1  2 
qcsrc/client/announcer.qc
qcsrc/common/effects/all.qh
qcsrc/common/items/inventory.qh
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
qcsrc/common/weapons/weapon/arc.qc
qcsrc/common/weapons/weapon/blaster.qc
qcsrc/common/weapons/weapon/crylink.qc
qcsrc/common/weapons/weapon/electro.qc
qcsrc/common/weapons/weapon/fireball.qc
qcsrc/common/weapons/weapon/hagar.qc
qcsrc/common/weapons/weapon/hlac.qc
qcsrc/common/weapons/weapon/minelayer.qc
qcsrc/common/weapons/weapon/mortar.qc
qcsrc/common/weapons/weapon/porto.qc
qcsrc/common/weapons/weapon/seeker.qc
qcsrc/common/weapons/weapon/shockwave.qc
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/common/weapons/weapon/vaporizer.qc
qcsrc/lib/oo.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator/gamemode_ctf.qc
qcsrc/server/weapons/throwing.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc qcsrc/lib/oo.qh
Simple merge
Simple merge
@@@ -34,11 -34,13 +34,12 @@@ string W_ThrowNewWeapon(entity own, flo
  {SELFPARAM();
        float thisammo, i;
        string s;
-       var .int ammotype = (get_weaponinfo(wpn)).ammo_field;
+       Weapon info = get_weaponinfo(wpn);
+       var .int ammotype = info.ammo_field;
  
 -      entity wep = spawn();
 +      entity wep = new(droppedweapon);
  
        setorigin(wep, org);
 -      wep.classname = "droppedweapon";
        wep.velocity = velo;
        wep.owner = wep.enemy = own;
        wep.flags |= FL_TOSSED;