From 7632d0debd9d4268533d2be3d8020ea82dde3479 Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Mon, 20 Jun 2022 11:46:29 -0700 Subject: [PATCH] Mapcycle: add Mapcycle_Load(), which will allow modes to suggest their own mapcycle. Subject to change. --- src/server/defs.h | 1 + src/server/mapcycle.qc | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/server/defs.h b/src/server/defs.h index 8a252952..8830043c 100644 --- a/src/server/defs.h +++ b/src/server/defs.h @@ -53,6 +53,7 @@ void Game_ServerModelEvent(float, int, string); void Event_ServerModelEvent(float, int, string); int Rules_IsTeamPlay(void); +void Mapcycle_Load(string); entity eActivator; diff --git a/src/server/mapcycle.qc b/src/server/mapcycle.qc index 0462ad9b..76e95801 100644 --- a/src/server/mapcycle.qc +++ b/src/server/mapcycle.qc @@ -16,9 +16,10 @@ var int autocvar_mapcycle_enabled = TRUE; var string autocvar_mapcycle_file = "mapcycle.txt"; +var string g_mapcycle_override = __NULL__; void -Mapcycle_Init(void) +Mapcycle_Load(string filename) { filestream fs_mapcycle; string temp; @@ -29,15 +30,13 @@ Mapcycle_Init(void) if (!autocvar_mapcycle_enabled) return; - print("--------- Initializing MapCycle ----------\n"); - /*if (Rules_IsMultiplayer()) return;*/ - fs_mapcycle = fopen(autocvar_mapcycle_file, FILE_READ); + fs_mapcycle = fopen(filename, FILE_READ); if (fs_mapcycle < 0) { - print(strcat("^1could not load ", autocvar_mapcycle_file, "\n")); + print(strcat("^1could not load ", filename, "\n")); return; } @@ -68,3 +67,11 @@ Mapcycle_Init(void) print(sprintf("mapcycle initialized with %i entries.\n", mapcount)); } + +void +Mapcycle_Init(void) +{ + print("--------- Initializing MapCycle ----------\n"); + + Mapcycle_Load(autocvar_mapcycle_file); +}