Skip to content

Commit 1c32214

Browse files
committed
suppress warning p4 hides global declaration
1 parent e75ea6f commit 1c32214

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

src/game/client/c_rope.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1505,8 +1505,11 @@ struct catmull_t
15051505
Vector c;
15061506
};
15071507

1508+
#pragma warning(push)
1509+
#pragma warning(disable: 4459) // declaration of 'p4' hides global declaration
15081510
// bake out the terms of the catmull rom spline
15091511
void Catmull_Rom_Spline_Matrix( const Vector &p1, const Vector &p2, const Vector &p3, const Vector &p4, catmull_t &output )
1512+
#pragma warning(pop)
15101513
{
15111514
output.t3 = 0.5f * ((-1*p1) + (3*p2) + (-3*p3) + p4); // 0.5 t^3 * [ (-1*p1) + ( 3*p2) + (-3*p3) + p4 ]
15121515
output.t2 = 0.5f * ((2*p1) + (-5*p2) + (4*p3) - p4); // 0.5 t^2 * [ ( 2*p1) + (-5*p2) + ( 4*p3) - p4 ]

0 commit comments

Comments
 (0)