From: terencehill Date: Mon, 6 May 2024 17:17:34 +0000 (+0200) Subject: Fix help messages (help-xonotic.cfg) not loaded at startup (dedicated server). X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=464f2cb22d51b0900a19b1c045d0fe4e80eeb891;p=xonotic%2Fxonotic-data.pk3dir.git Fix help messages (help-xonotic.cfg) not loaded at startup (dedicated server). They were wrongly formatted too because help_cfg_prefix didn't exist when they were defined (due to help-xonotic.cfg being executed before help.cfg) so I had to fix it too. It gets rid of this error: Unknown command "if_dedicated" that happened because 'if_dedicated exec help-xonotic.cfg' was executed before if_dedicated definition (in commands.cfg) --- diff --git a/xonotic-common.cfg b/xonotic-common.cfg index d8a1f1c20..6626eb826 100644 --- a/xonotic-common.cfg +++ b/xonotic-common.cfg @@ -42,6 +42,12 @@ set sv_master2 "dpm6.xonotic.xyz:27777" // gazby, soylent_cow set sv_master3 "master3.xonotic.org:27950" set sv_master4 "master4.xonotic.org:42863" +// load console command aliases and settings +exec commands.cfg + +// this should be executed only once even on ruleset-votable servers, otherwise the tips would always start from 0 +if_dedicated exec help.cfg + exec xonotic-client.cfg exec xonotic-server.cfg @@ -156,14 +162,8 @@ set prvm_garbagecollection_enable 0 set g_mapinfo_q3compat 1 "0: generate .mapinfo if none exists, ignoring .arena and .defi files. 1: read .arena and .defi files, don't generate .mapinfo. 2: generate .mapinfo if none exists using data from .arena files instead of reading them, .defi files continue to be used directly" -// load console command aliases and settings -exec commands.cfg - // ... and now that everything is configured/aliased, we can do some things: // Change g_start_delay based upon if the server is local or not. if_client set g_start_delay 0 "delay before the game starts, so everyone can join; recommended to set this to like 15 on a public server" if_dedicated set g_start_delay 15 "delay before the game starts, so everyone can join; recommended to set this to like 15 on a public server" - -// this should be execed only once even on ruleset-votable servers, otherwise the tips would always start from 0 -if_dedicated exec help.cfg