Merge f834704bc2 into 29985681a1

fix CBaseAnimating::TestHitboxes
2025-06-18 05:08:30 +00:00 · 2025-01-11 13:46:38 +00:00 · 2025-01-11 21:46:28 +08:00
2 changed files with 4 additions and 2 deletions
--- a/game/client/c_baseanimating.cpp
+++ b/game/client/c_baseanimating.cpp
@ -4981,9 +4981,10 @@ bool C_BaseAnimating::TestHitboxes( const Ray_t &ray, unsigned int fContentsMask
 				VPhysicsSetObject( pReplace );
 			}
 		}
+		return true;
 	}

-	return true;
+	return false;
 }


--- a/game/server/baseanimating.cpp
+++ b/game/server/baseanimating.cpp
@ -2693,8 +2693,9 @@ bool CBaseAnimating::TestHitboxes( const Ray_t &ray, unsigned int fContentsMask,
 		tr.surface.name = "**studio**";
 		tr.surface.flags = SURF_HITBOX;
 		tr.surface.surfaceProps = physprops->GetSurfaceIndex( pBone->pszSurfaceProp() );
+		return true;
 	}
-	return true;
+	return false;
 }

 void CBaseAnimating::InitBoneControllers ( void ) // FIXME: rename
Author	SHA1	Message	Date
wjxggg	0321e54c3e	Merge `f834704bc2` into `29985681a1`	2025-01-11 13:46:38 +00:00
wjxggg	f834704bc2	fix CBaseAnimating::TestHitboxes	2025-01-11 21:46:28 +08:00