Merge branch 'master' into TimePath/guide

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

diff --cc qcsrc/common/monsters/monster.qh
index d0526da0d0912ab41f13d830f60fc850a0305fdb,702267c3ad2e1b37883d66a61eaacce0210f7e6c..34ee17c35dbafa158c542c04adf43bab28f28c30
--- 1/qcsrc/common/monsters/monster.qh
--- 2/qcsrc/common/monsters/monster.qh
+++ b/qcsrc/common/monsters/monster.qh
@@@ -59,16 -57,7 +59,16 @@@ CLASS(Monster, Object
      METHOD(Monster, mr_pain, float(Monster this, entity actor, float damage_take, entity attacker, float deathtype)) { TC(Monster, this); return damage_take; }
      /** (BOTH?) sets animations for monster */
      METHOD(Monster, mr_anim, bool(Monster this, entity actor)) { TC(Monster, this); return false; }
 -
 +#ifdef MENUQC
 +    METHOD(Monster, describe, string(Monster this)) {
 +        TC(Monster, this);
 +        return SUPER(Monster).describe(this);
 +    }
 +#endif
 +    METHOD(Monster, display, void(Monster this, void(string name, string icon) returns)) {
 +        TC(Monster, this);
-         returns(this.m_name, this.m_icon ? sprintf("/gfx/hud/%s/%s", cvar_string("menu_skin"), this.m_icon) : string_null);
++        returns(this.m_name, this.m_icon ? sprintf("/gfx/hud/%s/%s", cvar_string("hud_skin"), this.m_icon) : string_null);
 +    }
  ENDCLASS(Monster)
  
  

diff --cc qcsrc/common/monsters/monster/golem.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/mutators/base.qh
index e37963deb88e41397f94bd8beac742a9073b31fa,2b4d3e34cbe23f61c1bd84ed587dbe705b07edfe..f6b3eda9160362cac22d18cece06394d3d11087a
--- 1/qcsrc/common/mutators/base.qh
--- 2/qcsrc/common/mutators/base.qh
+++ b/qcsrc/common/mutators/base.qh
@@@ -160,13 -157,10 +160,13 @@@ CLASS(Mutator, Object
      ATTRIB(Mutator, m_name, string);
      ATTRIB(Mutator, mutatorfunc, mutatorfunc_t);
      ATTRIB(Mutator, mutatorcheck, bool());
 -    CONSTRUCTOR(Mutator, string _name, mutatorfunc_t func) {
 -        CONSTRUCT(Mutator);
 -        this.m_name = _name;
 -        this.mutatorfunc = func;
 +    METHOD(Mutator, describe, string(Mutator this)) {
 +        TC(Mutator, this);
 +        return SUPER(Mutator).describe(this);
 +    }
 +    METHOD(Mutator, display, void(Mutator this, void(string name, string icon) returns)) {
 +        TC(Mutator, this);
-         returns(this.message, this.m_icon ? sprintf("/gfx/hud/%s/%s", cvar_string("menu_skin"), this.m_icon) : string_null);
++        returns(this.message, this.m_icon ? sprintf("/gfx/hud/%s/%s", cvar_string("hud_skin"), this.m_icon) : string_null);
      }
  ENDCLASS(Mutator)
  

diff --cc qcsrc/common/mutators/mutator/buffs/buffs.qh
index b7c5bbd108ef28c0f3ccc39b1a53a279e2658752,b936cac65ecc7af33719f47fe84a778dda593738..f18e688fbec33a7391e325d48164a81aec3c9929
--- 1/qcsrc/common/mutators/mutator/buffs/buffs.qh
--- 2/qcsrc/common/mutators/mutator/buffs/buffs.qh
+++ b/qcsrc/common/mutators/mutator/buffs/buffs.qh
@@@ -22,20 -22,12 +22,20 @@@ CLASS(Buff, StatusEffect
        ATTRIB(Buff, m_skin, int, 0);
        ATTRIB(Buff, m_lifetime, float, 60);
        ATTRIB(Buff, m_sprite, string, "");
 -      METHOD(Buff, display, void(entity this, void(string name, string icon) returns)) {
 -              returns(this.m_name, sprintf("/gfx/hud/%s/%s", cvar_string("hud_skin"), this.m_icon));
 +      METHOD(Buff, display, void(Buff this, void(string name, string icon) returns)) {
 +              TC(Buff, this);
-               returns(this.m_name, this.m_icon ? sprintf("/gfx/hud/%s/%s", cvar_string("menu_skin"), this.m_icon) : string_null);
++              returns(this.m_name, this.m_icon ? sprintf("/gfx/hud/%s/%s", cvar_string("hud_skin"), this.m_icon) : string_null);
        }
  #ifdef SVQC
 -      METHOD(Buff, m_time, float(Buff this))
 -      { return cvar(strcat("g_buffs_", this.netname, "_time")); }
 +      METHOD(Buff, m_time, float(Buff this)) {
 +              return cvar(strcat("g_buffs_", this.netname, "_time"));
 +      }
 +#endif
 +#ifdef MENUQC
 +      METHOD(Buff, describe, string(Buff this)) {
 +              TC(Buff, this);
 +              return SUPER(Buff).describe(this);
 +      }
  #endif
  ENDCLASS(Buff)
  

diff --cc qcsrc/common/mutators/mutator/nades/nades.qh
index 280d7510d684414b8453c94b1fd07df487d8af93,456fb608ab816f16e3de5e3deb329c6296bed035..33081556de90f82546081e3515424bc942f26bd2
--- 1/qcsrc/common/mutators/mutator/nades/nades.qh
--- 2/qcsrc/common/mutators/mutator/nades/nades.qh
+++ b/qcsrc/common/mutators/mutator/nades/nades.qh
@@@ -16,22 -16,12 +16,22 @@@ CLASS(Nade, Object
      ATTRIB(Nade, m_alpha, float, 1);
      ATTRIBARRAY(Nade, m_projectile, int, 2);
      ATTRIBARRAY(Nade, m_trail, entity, 2);
 -    METHOD(Nade, display, void(entity this, void(string name, string icon) returns)) {
 -        returns(this.m_name, sprintf("/gfx/hud/%s/%s", cvar_string("hud_skin"), this.m_icon));
 +    METHOD(Nade, display, void(Nade this, void(string name, string icon) returns)) {
 +        TC(Nade, this);
-         returns(this.m_name, this.m_icon ? sprintf("/gfx/hud/%s/%s", cvar_string("menu_skin"), this.m_icon) : string_null);
++        returns(this.m_name, this.m_icon ? sprintf("/gfx/hud/%s/%s", cvar_string("hud_skin"), this.m_icon) : string_null);
      }
 +#ifdef MENUQC
 +    METHOD(Nade, describe, string(Nade this)) {
 +        TC(Nade, this);
 +        return SUPER(Nade).describe(this);
 +    }
 +#endif
  ENDCLASS(Nade)
  
 -REGISTER_NADE(Null, NEW(Nade));
 +CLASS(NullNade, Nade)
 +    ATTRIB(NullNade, m_hidden, bool, true);
 +ENDCLASS(NullNade)
 +REGISTER(Nades, NADE_TYPE, Null, m_id, NEW(NullNade));
  REGISTRY_DEFINE_GET(Nades, NADE_TYPE_Null)
  
  // use slots 70-100

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

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

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

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

diff --cc qcsrc/common/turrets/turret.qh
index 31e26e3f8eb1d214c2fae918d92271031d0a1f19,b50e6ef51f57b5f7e6357084d70c8e82b76ed989..9742c6537114c2e1fdf2b753a555b2a825f3c6ff
--- 1/qcsrc/common/turrets/turret.qh
--- 2/qcsrc/common/turrets/turret.qh
+++ b/qcsrc/common/turrets/turret.qh
@@@ -27,8 -23,7 +27,8 @@@ CLASS(Turret, Object
      ATTRIB(Turret, m_maxs, vector, '0 0 0');
  
      METHOD(Turret, display, void(Turret this, void(string name, string icon) returns)) {
 -        returns(this.m_name, string_null);
 +        TC(Turret, this);
-         returns(this.m_name, this.m_icon ? sprintf("/gfx/hud/%s/%s", cvar_string("menu_skin"), this.m_icon) : string_null);
++        returns(this.m_name, this.m_icon ? sprintf("/gfx/hud/%s/%s", cvar_string("hud_skin"), this.m_icon) : string_null);
      }
      /** (BOTH) setup turret data */
      METHOD(Turret, tr_setup, void(Turret this, entity it)) {

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

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

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

diff --cc qcsrc/common/vehicles/vehicle.qh
index 5837ba1f5f49513e36e0afbbe4b56e445d05cd95,b812ce9a8d88bd679f71b464bbb7c93aa425532f..4058fba8a438ab9dc68fc76bd3590642ac1dcbfc
--- 1/qcsrc/common/vehicles/vehicle.qh
--- 2/qcsrc/common/vehicles/vehicle.qh
+++ b/qcsrc/common/vehicles/vehicle.qh
@@@ -37,17 -37,6 +37,17 @@@ CLASS(Vehicle, Object
      /** vehicle 3rd person view distance */
      ATTRIB(Vehicle, height, float, 0);
  
-         returns(this.m_name, this.m_icon ? sprintf("/gfx/hud/%s/%s", cvar_string("menu_skin"), this.m_icon) : string_null);
 +#ifdef MENUQC
 +    METHOD(Vehicle, describe, string(Vehicle this)) {
 +        TC(Vehicle, this);
 +        return SUPER(Vehicle).describe(this);
 +    }
 +#endif
 +    METHOD(Vehicle, display, void(Vehicle this, void(string name, string icon) returns)) {
 +        TC(Vehicle, this);
++        returns(this.m_name, this.m_icon ? sprintf("/gfx/hud/%s/%s", cvar_string("hud_skin"), this.m_icon) : string_null);
 +    }
 +
      /** (BOTH) setup vehicle data */
      METHOD(Vehicle, vr_setup, void(Vehicle this, entity instance)) { }
      /** (SERVER) logic to run every frame */

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

diff --cc qcsrc/common/weapons/weapon.qh
index f9f1d6f5bb590a2fb571b06a6add1f5e3d621554,611f8f5f7295a2b25aebdcceb24da791e6e998f4..c24bfb96ae336f5d423fa7c1a9433977802ce18d
--- 1/qcsrc/common/weapons/weapon.qh
--- 2/qcsrc/common/weapons/weapon.qh
+++ b/qcsrc/common/weapons/weapon.qh
@@@ -126,16 -126,9 +126,16 @@@ CLASS(Weapon, Object
        METHOD(Weapon, wr_pickup, void(Weapon this, entity actor, .entity weaponentity)) {}
        /** (SERVER) update cvar based properties */
        METHOD(Weapon, wr_update, void(Weapon this)) {}
 -      METHOD(Weapon, display, void(entity this, void(string name, string icon) returns)) {
 +      METHOD(Weapon, display, void(Weapon this, void(string name, string icon) returns)) {
 +              TC(Weapon, this);
-               returns(this.m_name, this.model2 ? sprintf("/gfx/hud/%s/%s", cvar_string("menu_skin"), this.model2) : string_null);
+               returns(this.m_name, (this.model2 != "") ? sprintf("/gfx/hud/%s/%s", cvar_string("hud_skin"), this.model2) : string_null);
        }
 +#ifdef MENUQC
 +      METHOD(Weapon, describe, string(Weapon this)) {
 +              TC(Weapon, this);
 +              return SUPER(Weapon).describe(this);
 +      }
 +#endif
  ENDCLASS(Weapon)
  
  #ifdef SVQC

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/devastator.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/hook.qc
Simple merge

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

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

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

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

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

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

diff --cc qcsrc/common/weapons/weapon/rifle.qh
Simple merge

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

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

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

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