From: terencehill Date: Mon, 11 Apr 2022 17:01:14 +0000 (+0200) Subject: Fix missing Welcome dialog when a local client connects to a local dedicated server X-Git-Tag: xonotic-v0.8.5~86 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cccb8e449e15be74c9df1e7034563952fc9fec80;p=xonotic%2Fxonotic-data.pk3dir.git Fix missing Welcome dialog when a local client connects to a local dedicated server --- diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc index 7e90b4f08..950b1114e 100644 --- a/qcsrc/server/scores.qc +++ b/qcsrc/server/scores.qc @@ -210,7 +210,8 @@ bool ScoreInfo_SendEntity(entity this, entity to, int sf) } // prevent sending the welcome message again when score types are sent again because the scoring system has changed // it can happen in some game modes like Race when the qualyfing session ends and the race starts - bool welcome_msg_too = (time < CS(this).jointime + 5); + // NOTE: CS(this) is not initialized yet when a local client connects to a local dedicated server + bool welcome_msg_too = (!CS(this) || time < CS(this).jointime + 5); WriteByte(MSG_ENTITY, welcome_msg_too); // welcome message is sent here because it needs to know the gametype if (welcome_msg_too)