From: otta8634 Date: Mon, 3 Feb 2025 11:32:59 +0000 (+0800) Subject: Merge branch 'master' into TimePath/guide X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b002220841b883dee5d5c9492d55f2161aa3816e;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into TimePath/guide --- b002220841b883dee5d5c9492d55f2161aa3816e diff --cc qcsrc/common/monsters/monster.qh index d0526da0d0,702267c3ad..34ee17c35d --- a/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/mutators/base.qh index e37963deb8,2b4d3e34cb..f6b3eda916 --- a/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 b7c5bbd108,b936cac65e..f18e688fbe --- a/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 280d7510d6,456fb608ab..33081556de --- a/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/turrets/turret.qh index 31e26e3f8e,b50e6ef51f..9742c65371 --- a/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/vehicles/vehicle.qh index 5837ba1f5f,b812ce9a8d..4058fba8a4 --- a/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); +#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("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 vehicle data */ METHOD(Vehicle, vr_setup, void(Vehicle this, entity instance)) { } /** (SERVER) logic to run every frame */ diff --cc qcsrc/common/weapons/weapon.qh index f9f1d6f5bb,611f8f5f72..c24bfb96ae --- a/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