From a334c080a10ee5e7867c3136c7a2a334ff16a732 Mon Sep 17 00:00:00 2001 From: bones_was_here Date: Sat, 15 Mar 2025 15:03:09 +1000 Subject: [PATCH] Remove redundant respawntimejitter warning This should have been part of https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/1480 --- qcsrc/server/items/items.qc | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/qcsrc/server/items/items.qc b/qcsrc/server/items/items.qc index a090808c8..0e9836fd0 100644 --- a/qcsrc/server/items/items.qc +++ b/qcsrc/server/items/items.qc @@ -1094,8 +1094,6 @@ void StartItem(entity this, entity def) } else { - this.reset = Item_Reset; - // must be done after def.m_iteminit() as that may set ITEM_FLAG_MUTATORBLOCKED if(!have_pickup_item(this)) { @@ -1103,20 +1101,17 @@ void StartItem(entity this, entity def) return; } - // must be done before Item_Reset() and after MUTATORBLOCKED check (blocked items may have null func ptrs) - if(!this.respawntime) // both need to be set + // must be done before Item_Reset() and after MUTATORBLOCKED check (blocked items may be uninitialised) + if(!this.respawntime) { if (def.m_respawntime) this.respawntime = def.m_respawntime; else LOG_WARNF("Default respawntime for a %s is unavailable from its itemdef", this.classname); - - if (def.m_respawntimejitter) - this.respawntimejitter = def.m_respawntimejitter; - else - LOG_WARNF("Default respawntimejitter for a %s is unavailable from its itemdef", this.classname); } + this.reset = Item_Reset; + if(this.angles != '0 0 0') this.SendFlags |= ISF_ANGLES; -- 2.39.5