From a1065d9036ebf841faaa96dfe039245eb493a293 Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 10 Apr 2023 23:10:47 +0100 Subject: [PATCH] G_MapIntoRoundQueue: Seperate into a general append function *and* a specific placement function. A surprise tool that will help us later --- src/g_game.c | 16 +++++++++++----- src/g_game.h | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index 8c5be2de7..cb5f728a5 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -3991,6 +3991,16 @@ static void G_HandleSaveLevel(void) // Next map apparatus struct roundqueue roundqueue; +void G_MapSlipIntoRoundQueue(UINT8 position, UINT16 map, UINT8 setgametype, boolean setencore, boolean rankrestricted) +{ + I_Assert(position < ROUNDQUEUE_MAX); + + roundqueue.entries[position].mapnum = map; + roundqueue.entries[position].gametype = setgametype; + roundqueue.entries[position].encore = setencore; + roundqueue.entries[position].rankrestricted = rankrestricted; +} + void G_MapIntoRoundQueue(UINT16 map, UINT8 setgametype, boolean setencore, boolean rankrestricted) { if (roundqueue.size >= ROUNDQUEUE_MAX) @@ -3999,11 +4009,7 @@ void G_MapIntoRoundQueue(UINT16 map, UINT8 setgametype, boolean setencore, boole return; } - roundqueue.entries[roundqueue.size].mapnum = map; - roundqueue.entries[roundqueue.size].gametype = setgametype; - roundqueue.entries[roundqueue.size].encore = setencore; - roundqueue.entries[roundqueue.size].rankrestricted = rankrestricted; - + G_MapSlipIntoRoundQueue(roundqueue.size, map, setgametype, setencore, rankrestricted); roundqueue.size++; } diff --git a/src/g_game.h b/src/g_game.h index e568ab49a..e2540a117 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -72,6 +72,7 @@ extern struct roundqueue roundentry_t entries[ROUNDQUEUE_MAX]; // Entries in the round queue } roundqueue; +void G_MapSlipIntoRoundQueue(UINT8 position, UINT16 map, UINT8 setgametype, boolean setencore, boolean rankrestricted); void G_MapIntoRoundQueue(UINT16 map, UINT8 setgametype, boolean setencore, boolean rankrestricted); void G_GPCupIntoRoundQueue(cupheader_t *cup, UINT8 setgametype, boolean setencore);