From 6377bbd13645c37d5ae2c4cfc6c4bef3a84cd1a0 Mon Sep 17 00:00:00 2001 From: bones_was_here Date: Wed, 26 Aug 2020 14:39:11 +1000 Subject: [PATCH] Fix StartItem indenting --- qcsrc/server/items/items.qc | 43 ++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/qcsrc/server/items/items.qc b/qcsrc/server/items/items.qc index bec701e13a..84e0e62cd4 100644 --- a/qcsrc/server/items/items.qc +++ b/qcsrc/server/items/items.qc @@ -1026,19 +1026,19 @@ void _StartItem(entity this, entity def, float defaultrespawntime, float default if(autocvar_spawn_debug >= 2) { - // why not flags & fl_item? - FOREACH_ENTITY_RADIUS(this.origin, 3, it.is_item, { - LOG_TRACE("XXX Found duplicated item: ", itemname, vtos(this.origin)); - LOG_TRACE(" vs ", it.netname, vtos(it.origin)); - error("Mapper sucks."); - }); + // why not flags & fl_item? + FOREACH_ENTITY_RADIUS(this.origin, 3, it.is_item, { + LOG_TRACE("XXX Found duplicated item: ", itemname, vtos(this.origin)); + LOG_TRACE(" vs ", it.netname, vtos(it.origin)); + error("Mapper sucks."); + }); this.is_item = true; } weaponsInMap |= WepSet_FromWeapon(REGISTRY_GET(Weapons, weaponid)); - if ( def.instanceOfPowerup - || def.instanceOfWeaponPickup + if ( def.instanceOfPowerup + || def.instanceOfWeaponPickup || (def.instanceOfHealth && def != ITEM_HealthSmall) || (def.instanceOfArmor && def != ITEM_ArmorSmall) || (itemid & (IT_KEY1 | IT_KEY2)) @@ -1111,18 +1111,21 @@ void _StartItem(entity this, entity def, float defaultrespawntime, float default void StartItem(entity this, GameItem def) { - def = def.m_spawnfunc_hookreplace(def, this); - if (def.spawnflags & ITEM_FLAG_MUTATORBLOCKED) - { - delete(this); - return; - } - this.classname = def.m_canonical_spawnfunc; - _StartItem( - this, - this.itemdef = def, - def.m_respawntime(), // defaultrespawntime - def.m_respawntimejitter() // defaultrespawntimejitter + def = def.m_spawnfunc_hookreplace(def, this); + + if (def.spawnflags & ITEM_FLAG_MUTATORBLOCKED) + { + delete(this); + return; + } + + this.classname = def.m_canonical_spawnfunc; + + _StartItem( + this, + this.itemdef = def, + def.m_respawntime(), // defaultrespawntime + def.m_respawntimejitter() // defaultrespawntimejitter ); } -- 2.39.2