Merge branch 'master' into TimePath/debug_draw

# Conflicts:
#	qcsrc/common/items/inventory.qh

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

diff --cc qcsrc/common/effects/all.qh
Simple merge

diff --cc qcsrc/common/items/inventory.qh
Simple merge

diff --cc qcsrc/common/monsters/monster/spider.qc
Simple merge

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

diff --cc qcsrc/common/weapons/weapon/arc.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/blaster.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/crylink.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/electro.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/fireball.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/hagar.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/hlac.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/minelayer.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/mortar.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/porto.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/seeker.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/shockwave.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/shotgun.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/vaporizer.qc
Simple merge

diff --cc qcsrc/lib/oo.qh
Simple merge

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

diff --cc qcsrc/server/mutators/mutator/gamemode_ctf.qc
Simple merge

diff --cc qcsrc/server/weapons/throwing.qc
index 0670183731afe10c2c786e3a93802c9928afa919,676e3f5d57b8d6bba617c9387f05b3834f34a6ed..d36e2dd4697fc3f97ab9c94f8621926be52de8c9
--- 1/qcsrc/server/weapons/throwing.qc
--- 2/qcsrc/server/weapons/throwing.qc
+++ b/qcsrc/server/weapons/throwing.qc
@@@ -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;