Merge branch 'master' into TimePath/items

# Conflicts:
#	qcsrc/lib/misc.qh
#	qcsrc/lib/oo.qh

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

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

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

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

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

diff --cc qcsrc/common/turrets/turret/ewheel_weapon.qc
Simple merge

diff --cc qcsrc/common/turrets/turret/flac_weapon.qc
Simple merge

diff --cc qcsrc/common/turrets/turret/hellion_weapon.qc
Simple merge

diff --cc qcsrc/common/turrets/turret/hk_weapon.qc
Simple merge

diff --cc qcsrc/common/turrets/turret/machinegun_weapon.qc
Simple merge

diff --cc qcsrc/common/turrets/turret/mlrs_weapon.qc
Simple merge

diff --cc qcsrc/common/turrets/turret/phaser_weapon.qc
Simple merge

diff --cc qcsrc/common/turrets/turret/plasma_dual.qc
Simple merge

diff --cc qcsrc/common/turrets/turret/plasma_weapon.qc
Simple merge

diff --cc qcsrc/common/turrets/turret/tesla_weapon.qc
Simple merge

diff --cc qcsrc/common/turrets/turret/walker_weapon.qc
Simple merge

diff --cc qcsrc/common/vehicles/vehicle/racer_weapon.qc
Simple merge

diff --cc qcsrc/common/vehicles/vehicle/raptor_weapons.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon.qh
index 624cb83f5226a478267018bc16f5f83146843db2,3d7ae3bb5c2706a1d5cceb9e594dd20492ae1456..63ce4c31a7ef50eda58cb609d18a28868c636946
--- 1/qcsrc/common/weapons/weapon.qh
--- 2/qcsrc/common/weapons/weapon.qh
+++ b/qcsrc/common/weapons/weapon.qh
@@@ -1,7 -1,8 +1,9 @@@
  #ifndef WEAPON_H
  #define WEAPON_H
 +#include "../items/item/pickup.qh"
  
+ const int MAX_WEAPONSLOTS = 2;
+ 
  .int ammo_shells;
  .int ammo_nails;
  .int ammo_rockets;

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/devastator.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/hmg.qc
index ebc4a48ff12f8f894bed396e8e19f7c1cf280057,c420cf08b116ed109b55f6b0cb1a878e5a50fd18..9ebc56f67743e93447c5698c60cda0dd9fe157c2
--- 1/qcsrc/common/weapons/weapon/hmg.qc
--- 2/qcsrc/common/weapons/weapon/hmg.qc
+++ b/qcsrc/common/weapons/weapon/hmg.qc
@@@ -43,9 -43,9 +43,9 @@@ HMG_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP
  #ifdef IMPLEMENTATION
  #ifdef SVQC
  
 -spawnfunc(weapon_hmg) { weapon_defaultspawnfunc(WEP_HMG.m_id); }
 +spawnfunc(weapon_hmg) { weapon_defaultspawnfunc(this, WEP_HMG); }
  
- void W_HeavyMachineGun_Attack_Auto(Weapon thiswep, entity actor, bool fire1, bool fire2)
+ void W_HeavyMachineGun_Attack_Auto(Weapon thiswep, entity actor, int slot, int fire)
  {
        if (!actor.BUTTON_ATCK)
        {

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

diff --cc qcsrc/common/weapons/weapon/machinegun.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/rifle.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/rpc.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/tuba.qc
Simple merge

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

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

diff --cc qcsrc/lib/misc.qh
index 938e2e6aca98fe671c737c0859ae4e88d1ed2c1d,692ef2553f10d9c973a6de7bc37655aacf1f9336..db7819b8cec056a7df0be4d9569dd4848aee0744
--- 1/qcsrc/lib/misc.qh
--- 2/qcsrc/lib/misc.qh
+++ b/qcsrc/lib/misc.qh
@@@ -25,15 -25,18 +25,18 @@@
  
  #define GET(name) name##get
  #define GETTER(type, name) type GET(name)() { return name; }
 -
 +#define PROPERTY(type, name) type name; GETTER(type, name)
- #define LAMBDA(...) { __VA_ARGS__ ; }
+ #define LAMBDA(...) { __VA_ARGS__; }
  
- // Can't wrap with do-while as block may contain continue or break
- #define WITH(type, name, value, block) { \
-     type __with_save = (name); \
-     name = (value); \
-     LAMBDA(block) \
-     name = __with_save; \
- } do { } while (0)
+ // With block may not contain continue or break
+ #define WITH(type, name, value, block) \
+       do \
+       { \
+               type __with_save = (name); \
+               name = (value); \
+               LAMBDA(block) \
+               name = __with_save; \
+       } \
+       while (0)
  
  #endif

diff --cc qcsrc/lib/oo.qh
index ed2029aec74fe87549cfa4b15251b43872b1c270,6a9a2e3b7d317bea9cb6424ed77c9f15602760f5..554dc3f814535ba7a7e09f6ad09fc99580b6442c
--- 1/qcsrc/lib/oo.qh
--- 2/qcsrc/lib/oo.qh
+++ b/qcsrc/lib/oo.qh
@@@ -87,46 -94,58 +94,58 @@@ STATIC_INIT(RegisterClasses
  #define INIT(cname) [[accumulate]] cname spawn##cname##_1(cname this)
  
  #define CLASS(cname, base)                  \
-     entityclass(cname, base);               \
-     class(cname) .bool instanceOf##cname;   \
-     VTBL(cname, base)                       \
-     INIT_STATIC(cname) {                    \
-         if (cname##_vtbl) {                 \
-             copyentity(cname##_vtbl, this); \
-             return;                         \
-         }                                   \
-         spawn##base##_static(this);         \
-         this.instanceOf##cname = true;      \
-     }                                       \
-     INIT(cname) {                           \
-         /* Only statically initialize the current class, it contains everything it inherits */ \
-         if (cname##_vtbl.vtblname == this.classname) { \
-             spawn##cname##_static(this);    \
-             this.classname = #cname;        \
-             this.vtblname = string_null;    \
-             this.vtblbase = cname##_vtbl;   \
-         }                                   \
-         spawn##base##_1(this);              \
-     }
+       entityclass(cname, base);               \
+       class(cname).bool instanceOf##cname;   \
+       VTBL(cname, base)                       \
+       INIT_STATIC(cname) \
+       {                    \
+               if (cname##_vtbl) \
+               {                 \
+                       copyentity(cname##_vtbl, this); \
+                       return;                         \
+               }                                   \
+               spawn##base##_static(this);         \
+               this.instanceOf##cname = true;      \
+       }                                       \
+       INIT(cname) \
+       {                           \
+               /* Only statically initialize the current class, it contains everything it inherits */ \
+               if (cname##_vtbl.vtblname == this.classname) \
+               { \
+                       spawn##cname##_static(this);    \
+                       this.classname = #cname;        \
+                       this.vtblname = string_null;    \
+                       this.vtblbase = cname##_vtbl;   \
+               }                                   \
+               spawn##base##_1(this);              \
+       }
  
  #define METHOD(cname, name, prototype)      \
-     class(cname) .prototype name;           \
-     prototype cname##_##name;               \
-     INIT_STATIC(cname) { this.name = cname##_##name; } \
-     prototype cname##_##name
+       class(cname).prototype name;           \
+       prototype cname##_##name;               \
+       INIT_STATIC(cname) \
+       { \
+               this.name = cname##_##name; \
+       } \
+       prototype cname##_##name
  
  #define ATTRIB(cname, name, type, val)      \
-     class(cname) .type name;                \
-     INIT(cname) { this.name = val; }
+       class(cname).type name;                \
+       INIT(cname) \
+       { \
+               this.name = val; \
+       }
  
  #define ATTRIBARRAY(cname, name, type, cnt) \
-     class(cname) .type name[cnt];
+       class(cname).type name[cnt];
  
  #define ENDCLASS(cname) \
-     INIT(cname) { return this; }
 -      [[last]] INIT(cname) \
++      INIT(cname) \
+       { \
+               return this; \
+       }
  
  #define SUPER(cname) (cname##_vtbl.vtblbase)
- #define super (this.vtblbase.vtblbase)
  
  #define spawn_static(this)
  #define spawn_1(this)

diff --cc qcsrc/server/defs.qh
Simple merge

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

diff --cc qcsrc/server/mutators/events.qh
Simple merge

diff --cc qcsrc/server/weapons/throwing.qc
Simple merge