From 5757b449740342266e541bab2c084e7ef3c2e5f3 Mon Sep 17 00:00:00 2001 From: tankefugl Date: Tue, 12 Apr 2005 13:45:54 +0000 Subject: [PATCH] o Fixed bounding box check for the hitbox o Enabled "new" hitbox code git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@70 67975925-1194-0748-b3d5-c16f83f1a3a1 --- dev/hitboxtest/source/mod/AvHServerUtil.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/hitboxtest/source/mod/AvHServerUtil.cpp b/dev/hitboxtest/source/mod/AvHServerUtil.cpp index ea12268c..ad50c47f 100644 --- a/dev/hitboxtest/source/mod/AvHServerUtil.cpp +++ b/dev/hitboxtest/source/mod/AvHServerUtil.cpp @@ -1333,7 +1333,7 @@ void AvHGetLineBounds(const Vector& vecStart, const Vector& vecEnd, Vector& outM outMaxs[0] += kBoundingBoxPadding; outMaxs[1] += kBoundingBoxPadding; - outMins[2] += kBoundingBoxPadding; + outMaxs[2] += kBoundingBoxPadding; } @@ -1408,14 +1408,14 @@ void AvHSUServerTraceBullets(const Vector& inStart, const Vector& inEnd, IGNORE_ outProtected = false; // This is the old way that doesn't take into account skulk rotation. - UTIL_TraceLine(inStart, inEnd, inIgnoreMonsters, /*dont_ignore_glass,*/ inIgnoreEdict, &outTraceResult); + // UTIL_TraceLine(inStart, inEnd, inIgnoreMonsters, /*dont_ignore_glass,*/ inIgnoreEdict, &outTraceResult); // TEMP removed the skulk hitboxes since it's too risky for the LAN. // joev: 0000573 // this was commented out meaning that it was just stock tracelines, not using Max M's superb hitbox collision code. // Now *all* hitboxes perform as expected and the crouched fade can be shot pretty much anywhere on the model // (allowing for about a 5% visual disparity) - //AvHTraceLine(inStart, inEnd, inIgnoreMonsters, /*dont_ignore_glass,*/ inIgnoreEdict, &outTraceResult); + AvHTraceLine(inStart, inEnd, inIgnoreMonsters, /*dont_ignore_glass,*/ inIgnoreEdict, &outTraceResult); // :joev CBaseEntity* theEntityHit = CBaseEntity::Instance(outTraceResult.pHit);