Merge f834704bc2 into 29985681a1

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;
 }
 
 

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