From 863e40d6f385c6772f76dba705b8bc45149356a9 Mon Sep 17 00:00:00 2001 From: Spoike Date: Tue, 7 Sep 2021 23:43:19 +0000 Subject: [PATCH] Fix Wastes builds to not crash on start. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6058 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/common/net_wins.c | 6 ++++-- engine/server/pr_cmds.c | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/engine/common/net_wins.c b/engine/common/net_wins.c index 9a73e0e84..2447ffe16 100644 --- a/engine/common/net_wins.c +++ b/engine/common/net_wins.c @@ -8564,6 +8564,10 @@ void NET_Init (void) Cvar_Register(&net_hybriddualstack, "networking"); Cvar_Register(&net_fakeloss, "networking"); +#if defined(HAVE_SSL) + Cvar_Register(&tls_provider, "networking"); + Cvar_Register(&tls_ignorecertificateerrors, "networking"); +#endif #if defined(TCPCONNECT) && (defined(HAVE_SERVER) || defined(HAVE_HTTPSV)) #ifdef HAVE_SERVER Cvar_Register(&net_enable_qizmo, "networking"); @@ -8573,8 +8577,6 @@ void NET_Init (void) #endif #if defined(HAVE_SSL) Cvar_Register(&net_enable_tls, "networking"); - Cvar_Register(&tls_ignorecertificateerrors, "networking"); - Cvar_Register(&tls_provider, "networking"); #endif #ifdef HAVE_HTTPSV Cvar_Register(&net_enable_http, "networking"); diff --git a/engine/server/pr_cmds.c b/engine/server/pr_cmds.c index 225f35038..c24184e32 100644 --- a/engine/server/pr_cmds.c +++ b/engine/server/pr_cmds.c @@ -13389,7 +13389,9 @@ void PR_DumpPlatform_f(void) {"MOVE_NORMAL", "const float", QW|NQ|CS, NULL, MOVE_NORMAL}, {"MOVE_NOMONSTERS", "const float", QW|NQ|CS, D("The trace will ignore all non-solid_bsp entities."), MOVE_NOMONSTERS}, {"MOVE_MISSILE", "const float", QW|NQ|CS, D("The trace will use a bbox size of +/- 15 against entities with FL_MONSTER set."), MOVE_MISSILE}, +#ifdef HAVE_LEGACY {"MOVE_WORLDONLY", "const float", QW|NQ|CS, D("The trace will ignore everything but the worldmodel. This is useful for to prevent the q3bsp pvs+culling issues that come with spectator modes leaving the world ."), MOVE_WORLDONLY}, +#endif {"MOVE_HITMODEL", "const float", QW|NQ|CS, D("Traces will impact the actual mesh of the model instead of merely their bounding box. Should generally only be used for tracelines. Note that this flag is unreliable as an object can animate through projectiles. The bounding box MUST be set to completely encompass the entity or those extra areas will be non-solid (leaving a hole for things to go through)."), MOVE_HITMODEL}, {"MOVE_TRIGGERS", "const float", QW|NQ|CS, D("This trace type will impact only triggers. It will ignore non-solid entities."), MOVE_TRIGGERS}, {"MOVE_EVERYTHING", "const float", QW|NQ|CS, D("This type of trace will hit solids and triggers alike. Even non-solid entities."), MOVE_EVERYTHING},