From 9354a0ab88e72c2087b93e54960762bb1d167883 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 23 Jan 2025 21:27:07 +0100 Subject: [PATCH] conflict fix --- src/hu_stuff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hu_stuff.c b/src/hu_stuff.c index 625668831..e94bd6598 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -2420,7 +2420,7 @@ Ping_gfx_num (int lag) // HU_drawPing // -void HU_drawPing(INT32 x, INT32 y, UINT32 lag, INT32 flags) +void HU_drawPing(INT32 x, INT32 y, INT32 pnum, INT32 flags) { UINT8 *colormap = NULL; INT32 measureid = cv_pingmeasurement.value ? 1 : 0;