• R/O
  • SSH

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

This is a fork of Zandronum used on servers hosted by The Sentinels Playground (TSPG), Euroboros (EB), and Down Under Doomers (DUD).


Commit MetaInfo

Revision88413862b6f07707f3ec0826b5e49e6d305d5ad2 (tree)
Time2024-04-11 05:30:31
AuthorJan K
CommiterJan K

Log Message

Expose voice chat setting to launcher queries

Change Summary

Incremental Difference

diff -r a195a1e29239 -r 88413862b6f0 src/sv_main.h
--- a/src/sv_main.h Thu Apr 11 15:00:18 2024 -0400
+++ b/src/sv_main.h Wed Apr 10 22:30:31 2024 +0200
@@ -147,13 +147,14 @@
147147 #define SQF2_COUNTRY 0x00000002
148148 #define SQF2_GAMEMODE_NAME 0x00000004
149149 #define SQF2_GAMEMODE_SHORTNAME 0x00000008
150+#define SQF2_VOICECHAT 0x00000010
150151
151152 #define SQF_ALL ( SQF_NAME|SQF_URL|SQF_EMAIL|SQF_MAPNAME|SQF_MAXCLIENTS|SQF_MAXPLAYERS| \
152153 SQF_PWADS|SQF_GAMETYPE|SQF_GAMENAME|SQF_IWAD|SQF_FORCEPASSWORD|SQF_FORCEJOINPASSWORD|SQF_GAMESKILL| \
153154 SQF_BOTSKILL|SQF_DMFLAGS|SQF_LIMITS|SQF_TEAMDAMAGE|SQF_TEAMSCORES|SQF_NUMPLAYERS|SQF_PLAYERDATA|SQF_TEAMINFO_NUMBER|SQF_TEAMINFO_NAME|SQF_TEAMINFO_COLOR|SQF_TEAMINFO_SCORE| \
154155 SQF_TESTING_SERVER|SQF_DATA_MD5SUM|SQF_ALL_DMFLAGS|SQF_SECURITY_SETTINGS|SQF_OPTIONAL_WADS|SQF_DEH|SQF_EXTENDED_INFO )
155156
156-#define SQF2_ALL ( SQF2_PWAD_HASHES|SQF2_COUNTRY|SQF2_GAMEMODE_NAME|SQF2_GAMEMODE_SHORTNAME )
157+#define SQF2_ALL ( SQF2_PWAD_HASHES|SQF2_COUNTRY|SQF2_GAMEMODE_NAME|SQF2_GAMEMODE_SHORTNAME|SQF2_VOICECHAT )
157158
158159 // [SB] Set to indicate when the last segment in a response is reached.
159160 #define LAUNCHER_LAST_SEGMENT 0x80
diff -r a195a1e29239 -r 88413862b6f0 src/sv_master.cpp
--- a/src/sv_master.cpp Thu Apr 11 15:00:18 2024 -0400
+++ b/src/sv_master.cpp Wed Apr 10 22:30:31 2024 +0200
@@ -74,6 +74,7 @@
7474 #include "version.h"
7575 #include "d_dehacked.h"
7676 #include "v_text.h"
77+#include "voicechat.h"
7778
7879 // [SB] This is easier than updating the parameters for a load of functions every time I want to add something.
7980 struct LauncherResponseContext
@@ -499,6 +500,13 @@
499500 }
500501
501502 //*****************************************************************************
503+// Send voice chat setting
504+static void server_master_WriteVoicechat( const LauncherResponseContext &ctx )
505+{
506+ ctx.pByteStream->WriteByte( sv_allowvoicechat );
507+}
508+
509+//*****************************************************************************
502510 // [SB] And now the big maps of functions.
503511 static const std::map<ULONG, LauncherFieldFunction> ResponseFunctions[] =
504512 {
@@ -541,6 +549,7 @@
541549 { SQF2_COUNTRY, server_master_WriteCountry },
542550 { SQF2_GAMEMODE_NAME, server_master_WriteGameModeName },
543551 { SQF2_GAMEMODE_SHORTNAME, server_master_WriteGameModeShortName },
552+ { SQF2_VOICECHAT, server_master_WriteVoicechat },
544553 }
545554 };
546555