From 6d271fc86ea460e34d51a00f2bd16f3712c4c45b Mon Sep 17 00:00:00 2001 From: terencehill Date: Fri, 22 Mar 2024 14:50:08 +0100 Subject: [PATCH] Fix compilation unit test by changing argument type in the GameTypeVote_SetGametype prototype. Same thing has already been done for the isGametypeInFilter prototype. --- qcsrc/common/util.qh | 1 + qcsrc/server/mapvoting.qh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh index 01933cb34..1a1ebdba7 100644 --- a/qcsrc/common/util.qh +++ b/qcsrc/common/util.qh @@ -143,6 +143,7 @@ string getWrappedLine_remaining; string getWrappedLine(float w, vector size, textLengthUpToWidth_widthFunction_t tw); string getWrappedLineLen(float w, textLengthUpToLength_lenFunction_t tw); +// FIXME can't use Gametype gt because Gitlab compilation unit test fails float isGametypeInFilter(entity gt, float tp, float ts, string pattern); vector solve_shotdirection(vector myorg, vector myvel, vector eorg, vector evel, float spd, float newton_style); diff --git a/qcsrc/server/mapvoting.qh b/qcsrc/server/mapvoting.qh index 41c41060d..f2515bdad 100644 --- a/qcsrc/server/mapvoting.qh +++ b/qcsrc/server/mapvoting.qh @@ -30,7 +30,8 @@ void MapVote_Start(); void MapVote_Spawn(); void MapVote_Think(); void MapVote_SendPicture(entity to, int id); -bool GameTypeVote_SetGametype(Gametype type, string gametype_string, bool call_hooks); +// FIXME can't use Gametype type because Gitlab compilation unit test fails +bool GameTypeVote_SetGametype(entity type, string gametype_string, bool call_hooks); float GameTypeVote_Start(); float GameTypeVote_Finished(int pos); string GameTypeVote_MapInfo_FixName(string m); -- 2.39.2