# HG changeset patch # User Adam Kaminski # Date 1629601353 14400 # Sat Aug 21 23:02:33 2021 -0400 # Node ID 865e4a3cf10fc31ea022dbc812df970302645d36 # Parent b71a5f791602644e7523354b65739328dea014f0 Renamed sv_noobituaries to compat_noobituaries; the original Doom didn't have obituaries, so it's appropriate for this to be a compatibility flag. diff -r b71a5f791602 -r 865e4a3cf10f docs/zandronum-history.txt --- a/docs/zandronum-history.txt Fri Aug 20 07:59:53 2021 -0400 +++ b/docs/zandronum-history.txt Sat Aug 21 23:02:33 2021 -0400 @@ -22,7 +22,7 @@ + - The server can now broadcast the MD5 hashes of loaded PWADs to launchers. [Sean] + - Added new console commands "demo_ticsplayed" to show the current position in demo playback and "demo_skipto" to skip to such a position. + - Added new console variable "sv_nodoorclose" to prevent manual door closing, in order to prevent large numbers of players from blocking a door by continuously opening and closing it. [DoomJoshuaBoy] -+ - Added new console variable "sv_noobituaries" to prevent obituaries from being printed to the server console when a player dies. [Kaminsky] ++ - Added new compatibility flag "compat_noobituaries" to prevent obituaries from being printed to the console when a player dies. [Kaminsky] + - Added new compatibility flag "compat_resetglobalvarsonmapreset" to reset all global ACS variables upon resetting the map like in survival. [Kaminsky] + - Added new ACS functions: SetGamemodeLimits(int limit, int value) to change gamemode limits, SetCurrentGamemode(str gamemode, bool reset) to switch gamemodes during a game, and GetCurrentGamemode() to get the gamemode being played. [Kaminsky] + - Added ACS function: SetPlayerClass(int player, str class, bool respawn) to allow changing of a player's class. [Kaminsky] diff -r b71a5f791602 -r 865e4a3cf10f src/cl_main.cpp --- a/src/cl_main.cpp Fri Aug 20 07:59:53 2021 -0400 +++ b/src/cl_main.cpp Sat Aug 21 23:02:33 2021 -0400 @@ -3957,7 +3957,7 @@ // Finally, print the obituary string. // [AK] Check if we shouldn't print the obituary due to ZADF_NO_OBITUARIES. - if (( zadmflags & ZADF_NO_OBITUARIES ) == false ) + if (( zacompatflags & ZACOMPATF_NO_OBITUARIES ) == false ) ClientObituary( player->mo, inflictor, source, ( ulSourcePlayer < MAXPLAYERS ) ? DMG_PLAYERATTACK : 0, MOD ); // [BB] Restore the weapon the player actually is using now. diff -r b71a5f791602 -r 865e4a3cf10f src/d_main.cpp --- a/src/d_main.cpp Fri Aug 20 07:59:53 2021 -0400 +++ b/src/d_main.cpp Sat Aug 21 23:02:33 2021 -0400 @@ -630,7 +630,6 @@ CVAR (Flag, sv_deadplayerscankeepinventory, zadmflags, ZADF_DEAD_PLAYERS_CAN_KEEP_INVENTORY); CVAR (Flag, sv_nounlaggedbfgtracers, zadmflags, ZADF_NOUNLAGGED_BFG_TRACERS); CVAR (Flag, sv_nodoorclose, zadmflags, ZADF_NODOORCLOSE); -CVAR (Flag, sv_noobituaries, zadmflags, ZADF_NO_OBITUARIES); CVAR (Flag, sv_forcesoftwarepitchlimits, zadmflags, ZADF_FORCE_SOFTWARE_PITCH_LIMITS); CVAR (Flag, sv_noprivatechat, zadmflags, ZADF_NO_PRIVATE_CHAT); @@ -814,6 +813,7 @@ CVAR (Flag, compat_silentwestspawns, zacompatflags, ZACOMPATF_SILENT_WEST_SPAWNS); CVAR (Flag, compat_skulltagjumping, zacompatflags, ZACOMPATF_SKULLTAG_JUMPING); CVAR (Flag, compat_resetglobalvarsonmapreset, zacompatflags, ZACOMPATF_RESET_GLOBALVARS_ON_MAPRESET); +CVAR (Flag, compat_noobituaries, zacompatflags, ZACOMPATF_NO_OBITUARIES); //========================================================================== // diff -r b71a5f791602 -r 865e4a3cf10f src/doomdef.h --- a/src/doomdef.h Fri Aug 20 07:59:53 2021 -0400 +++ b/src/doomdef.h Sat Aug 21 23:02:33 2021 -0400 @@ -381,14 +381,11 @@ // by closing doors that other players (or the same player) have opened. ZADF_NODOORCLOSE = 1 << 19, - // [AK] Prevent obituary messages from being printed onto the server console when a player dies. - ZADF_NO_OBITUARIES = 1 << 20, - // [AK] Forces the player's pitch to be limited to what's allowed in the software renderer. - ZADF_FORCE_SOFTWARE_PITCH_LIMITS = 1 << 21, + ZADF_FORCE_SOFTWARE_PITCH_LIMITS = 1 << 20, // [AK] No private messaging allowed on the server. - ZADF_NO_PRIVATE_CHAT = 1 << 22, + ZADF_NO_PRIVATE_CHAT = 1 << 21, }; // [RH] Compatibility flags. @@ -474,6 +471,8 @@ ZACOMPATF_SKULLTAG_JUMPING = 1 << 12, // [AK] World and global-scope ACS variables/arrays will be reset upon resetting the map like in survival. ZACOMPATF_RESET_GLOBALVARS_ON_MAPRESET = 1 << 13, + // [AK] Prevent obituary messages from being printed to the console when a player dies. + ZACOMPATF_NO_OBITUARIES = 1 << 14, // Limited movement in the air. ZACOMPATF_LIMITED_AIRMOVEMENT = 1 << 17, diff -r b71a5f791602 -r 865e4a3cf10f src/p_interaction.cpp --- a/src/p_interaction.cpp Fri Aug 20 07:59:53 2021 -0400 +++ b/src/p_interaction.cpp Sat Aug 21 23:02:33 2021 -0400 @@ -952,7 +952,7 @@ // [RH] Death messages // [AK] Also check if we shouldn't print the obituary due to ZADF_NO_OBITUARIES. - if (( player ) && ( NETWORK_InClientMode() == false ) && ( zadmflags & ZADF_NO_OBITUARIES ) == false ) + if (( player ) && ( NETWORK_InClientMode() == false ) && ( zacompatflags & ZACOMPATF_NO_OBITUARIES ) == false ) ClientObituary (this, inflictor, source, dmgflags, MeansOfDeath); } diff -r b71a5f791602 -r 865e4a3cf10f wadsrc/static/menudef.txt --- a/wadsrc/static/menudef.txt Fri Aug 20 07:59:53 2021 -0400 +++ b/wadsrc/static/menudef.txt Sat Aug 21 23:02:33 2021 -0400 @@ -1297,7 +1297,6 @@ Option "Allow automap", "sv_noautomap", "NoYes" Option "Automap allies", "sv_noautomapallies", "NoYes" Option "Allow spying", "sv_disallowspying", "NoYes" - Option "Allow obituaries", "sv_noobituaries", "NoYes" Option "Chasecam cheat", "sv_chasecam", "YesNo" Option "Check ammo for weapon switch", "sv_dontcheckammo", "NoYes" Option "Icon's death kills its spawns", "sv_killbossmonst", "YesNo" @@ -1468,6 +1467,7 @@ Option "West facing spawns are silent", "compat_silentwestspawns", "YesNo" Option "Use old Skulltag jumping behavior", "compat_skulltagjumping", "YesNo" Option "Reset global ACS variables upon map reset", "compat_resetglobalvarsonmapreset", "YesNo" + Option "No obituaries", "compat_noobituaries", "YesNo" Class "CompatibilityMenu" }