From 1c2a421648ea61d786a01e6d05d2a8285d0a044e Mon Sep 17 00:00:00 2001 From: RGreenlees Date: Tue, 12 Sep 2023 16:30:07 +0100 Subject: [PATCH] Reverted the ignore intangible check on building placement This sadly means that buildings cannot be placed where destroyed func_breakables and func_weldables are. Unfortunately, the fix also meant structures could be placed inside railings which would immediately cause them to sink --- main/source/mod/AvHSharedUtil.cpp | 2 +- main/source/mod/AvHWeldable.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main/source/mod/AvHSharedUtil.cpp b/main/source/mod/AvHSharedUtil.cpp index ca0faa24..152aa030 100644 --- a/main/source/mod/AvHSharedUtil.cpp +++ b/main/source/mod/AvHSharedUtil.cpp @@ -2745,7 +2745,7 @@ bool AvHSHUGetCanDropItem(vec3_t& ioCenter, Vector& inMinSize, Vector& inMaxSize //adjust origin to be base float theOrigin[3] = { ioCenter[0], ioCenter[1], ioCenter[2] + inMinSize[2] }; - CollisionChecker Checker(pmove, kHLPointHullIndex, CollisionChecker::HULL_TYPE_ALL, inIgnorePlayers, CollisionChecker::IGNORE_INTANGIBLE, inIgnoreIndex); + CollisionChecker Checker(pmove, kHLPointHullIndex, CollisionChecker::HULL_TYPE_ALL, inIgnorePlayers, CollisionChecker::IGNORE_NONE, inIgnoreIndex); bool theCanDropItem = (Checker.GetContentsInCylinder(theOrigin,theRadius,theHeight) != CONTENTS_SOLID); diff --git a/main/source/mod/AvHWeldable.cpp b/main/source/mod/AvHWeldable.cpp index 100381db..d20c96fb 100644 --- a/main/source/mod/AvHWeldable.cpp +++ b/main/source/mod/AvHWeldable.cpp @@ -322,7 +322,7 @@ void AvHWeldable::UpdateEntityState() //this->pev->solid = 5; this->pev->solid = SOLID_NOT; - this->pev->effects = EF_NODRAW; + //this->pev->effects = EF_NODRAW; this->pev->takedamage = DAMAGE_NO; this->pev->deadflag = DEAD_DEAD;