• R/O
  • SSH

zandronum-sandbox-stable: Commit


Commit MetaInfo

Revisiónceb97339f836673f501b742f3ca3000ba282047b (tree)
Tiempo2022-06-13 05:06:20
AutorAdam Kaminski <kaminskiadam9@gmai...>
CommiterAdam Kaminski

Log Message

By default, the join queue is no longer cleared between levels for all game modes like in duel. The old behaviour can be restored by enabling the new dmflag "sv_dontkeepjoinqueue" which also works in duel (addresses 3993).

Cambiar Resumen

Diferencia incremental

diff -r 2596040ceab9 -r ceb97339f836 src/d_main.cpp
--- a/src/d_main.cpp Wed Jun 08 10:08:39 2022 -0400
+++ b/src/d_main.cpp Sun Jun 12 16:06:20 2022 -0400
@@ -632,6 +632,7 @@
632632 CVAR (Flag, sv_forcesoftwarepitchlimits, zadmflags, ZADF_FORCE_SOFTWARE_PITCH_LIMITS);
633633 CVAR (Flag, sv_shootthroughallies, zadmflags, ZADF_SHOOT_THROUGH_ALLIES);
634634 CVAR (Flag, sv_dontpushallies, zadmflags, ZADF_DONT_PUSH_ALLIES);
635+CVAR (Flag, sv_dontkeepjoinqueue, zadmflags, ZADF_DONT_KEEP_JOIN_QUEUE);
635636
636637 // Old name kept for compatibility
637638 CVAR (Flag, sv_forcegldefaults, zadmflags, ZADF_FORCE_VIDEO_DEFAULTS);
diff -r 2596040ceab9 -r ceb97339f836 src/doomdef.h
--- a/src/doomdef.h Wed Jun 08 10:08:39 2022 -0400
+++ b/src/doomdef.h Sun Jun 12 16:06:20 2022 -0400
@@ -389,6 +389,9 @@
389389
390390 // [AK] Players aren't pushed by attacks caused by their teammates (e.g. BFG tracers).
391391 ZADF_DONT_PUSH_ALLIES = 1 << 22,
392+
393+ // [AK] If enabled, the join queue is cleared between level changes.
394+ ZADF_DONT_KEEP_JOIN_QUEUE = 1 << 23,
392395 };
393396
394397 // [RH] Compatibility flags.
diff -r 2596040ceab9 -r ceb97339f836 src/p_setup.cpp
--- a/src/p_setup.cpp Wed Jun 08 10:08:39 2022 -0400
+++ b/src/p_setup.cpp Sun Jun 12 16:06:20 2022 -0400
@@ -4533,9 +4533,9 @@
45334533 if ( players[i].bOnTeam && ( GAMEMODE_GetCurrentFlags() & GMF_PLAYERSONTEAMS ) )
45344534 PLAYER_SetTeam( &players[i], teams.Size( ), true );
45354535
4536- // [BB] In duel the players should keep their position in line after a "changemap"
4537- // map change.
4538- if ( duel == false )
4536+ // [AK] Players only keep their position in line after a "changemap" map change
4537+ // if ZADF_DONT_KEEP_JOIN_QUEUE isn't enabled.
4538+ if ( zadmflags & ZADF_DONT_KEEP_JOIN_QUEUE )
45394539 {
45404540 // [BB] If the player was in the join queue, remove him.
45414541 JOINQUEUE_RemovePlayerFromQueue ( i );
diff -r 2596040ceab9 -r ceb97339f836 wadsrc/static/menudef.txt
--- a/wadsrc/static/menudef.txt Wed Jun 08 10:08:39 2022 -0400
+++ b/wadsrc/static/menudef.txt Sun Jun 12 16:06:20 2022 -0400
@@ -1316,6 +1316,7 @@
13161316 Option "Force software pitch limits", "sv_forcesoftwarepitchlimits", "YesNo"
13171317 Option "Shoot through allies", "sv_shootthroughallies", "YesNo"
13181318 Option "Attacks push allies", "sv_dontpushallies", "NoYes"
1319+ Option "Clear join queue between levels", "sv_dontkeepjoinqueue", "YesNo"
13191320 // [TP] --
13201321
13211322 StaticText " "
Show on old repository browser