zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-12-11 04:51:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Add the DF2_NO_COOP_THING_SPAWNDM flag to prevent spawning MP things in coop.

Browse source
This commit is contained in:
drfrag 2020-08-29 17:57:24 +02:00
parent 6b16b6a0c1
commit 74cffeb84f
5 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/d_main.cpp
View file

@ -536,6 +536,7 @@ CVAR (Flag, sv_dontcheckammo, dmflags2, DF2_DONTCHECKAMMO);
CVAR (Flag, sv_killbossmonst, dmflags2, DF2_KILLBOSSMONST); CVAR (Flag, sv_killbossmonst, dmflags2, DF2_KILLBOSSMONST);
CVAR (Flag, sv_nocountendmonst, dmflags2, DF2_NOCOUNTENDMONST); CVAR (Flag, sv_nocountendmonst, dmflags2, DF2_NOCOUNTENDMONST);
CVAR (Flag, sv_respawnsuper, dmflags2, DF2_RESPAWN_SUPER); CVAR (Flag, sv_respawnsuper, dmflags2, DF2_RESPAWN_SUPER);
CVAR (Flag, sv_nothingspawn, dmflags2, DF2_NO_COOP_THING_SPAWN);
//========================================================================== //==========================================================================
// //

3
src/doomdef.h
View file

@ -428,7 +428,7 @@ enum
// [BC] More dmflags. w00p! // [BC] More dmflags. w00p!
enum enum
{ {
// DF2_YES_IMPALING = 1 << 0, // Player gets implaed on MF2_IMPALE items // DF2_YES_IMPALING = 1 << 0, // Player gets impaled on MF2_IMPALE items
DF2_YES_WEAPONDROP = 1 << 1, // Drop current weapon upon death DF2_YES_WEAPONDROP = 1 << 1, // Drop current weapon upon death
// DF2_NO_RUNES = 1 << 2, // Don't spawn runes // DF2_NO_RUNES = 1 << 2, // Don't spawn runes
// DF2_INSTANT_RETURN = 1 << 3, // Instantly return flags and skulls when player carrying it dies (ST/CTF) // DF2_INSTANT_RETURN = 1 << 3, // Instantly return flags and skulls when player carrying it dies (ST/CTF)
@ -456,6 +456,7 @@ enum
DF2_KILLBOSSMONST = 1 << 25, // Kills all monsters spawned by a boss cube when the boss dies DF2_KILLBOSSMONST = 1 << 25, // Kills all monsters spawned by a boss cube when the boss dies
DF2_NOCOUNTENDMONST = 1 << 26, // Do not count monsters in 'end level when dying' sectors towards kill count DF2_NOCOUNTENDMONST = 1 << 26, // Do not count monsters in 'end level when dying' sectors towards kill count
DF2_RESPAWN_SUPER = 1 << 27, // Respawn invulnerability and invisibility DF2_RESPAWN_SUPER = 1 << 27, // Respawn invulnerability and invisibility
DF2_NO_COOP_THING_SPAWN = 1 << 28, // Don't spawn multiplayer things in coop games
}; };
// [RH] Compatibility flags. // [RH] Compatibility flags.

7
src/p_mobj.cpp
View file

@ -5524,6 +5524,13 @@ AActor *P_SpawnMapThing (FMapThing *mthing, int position)
if (deathmatch && info->flags & MF_NOTDMATCH) if (deathmatch && info->flags & MF_NOTDMATCH)
return NULL; return NULL;
// don't spawn extra things in coop if so desired
if (multiplayer && !deathmatch && (dmflags2 & DF2_NO_COOP_THING_SPAWN))
{
if ((mthing->flags & (MTF_DEATHMATCH|MTF_SINGLE)) == MTF_DEATHMATCH)
return NULL;
}
// [RH] don't spawn extra weapons in coop if so desired // [RH] don't spawn extra weapons in coop if so desired
if (multiplayer && !deathmatch && (dmflags & DF_NO_COOP_WEAPON_SPAWN)) if (multiplayer && !deathmatch && (dmflags & DF_NO_COOP_WEAPON_SPAWN))
{ {

1
wadsrc/static/language.enu
View file

@ -2161,6 +2161,7 @@ GMPLYMNU_KEEPFRAGS = "Keep frags gained";
GMPLYMNU_NOTEAMSWITCH = "No team switching"; GMPLYMNU_NOTEAMSWITCH = "No team switching";
GMPLYMNU_COOPERATIVE = "Cooperative Settings"; GMPLYMNU_COOPERATIVE = "Cooperative Settings";
GMPLYMNU_MULTIPLAYERWEAPONS = "Spawn multi. weapons"; GMPLYMNU_MULTIPLAYERWEAPONS = "Spawn multi. weapons";
GMPLYMNU_MULTIPLAYERTHINGS = "Spawn multi. things";
GMPLYMNU_LOSEINVENTORY = "Lose entire inventory"; GMPLYMNU_LOSEINVENTORY = "Lose entire inventory";
GMPLYMNU_KEEPKEYS = "Keep keys"; GMPLYMNU_KEEPKEYS = "Keep keys";
GMPLYMNU_KEEPWEAPONS = "Keep weapons"; GMPLYMNU_KEEPWEAPONS = "Keep weapons";

1
wadsrc/static/menudef.txt
View file

@ -1619,6 +1619,7 @@ OptionMenu CoopOptions protected
{ {
Title "$GMPLYMNU_COOPERATIVE" Title "$GMPLYMNU_COOPERATIVE"
Option "$GMPLYMNU_MULTIPLAYERTHINGS", "sv_nothingspawn", "NoYes"
Option "$GMPLYMNU_MULTIPLAYERWEAPONS", "sv_noweaponspawn", "NoYes" Option "$GMPLYMNU_MULTIPLAYERWEAPONS", "sv_noweaponspawn", "NoYes"
Option "$GMPLYMNU_LOSEINVENTORY", "sv_cooploseinventory", "YesNo" Option "$GMPLYMNU_LOSEINVENTORY", "sv_cooploseinventory", "YesNo"
Option "$GMPLYMNU_KEEPKEYS", "sv_cooplosekeys", "NoYes" Option "$GMPLYMNU_KEEPKEYS", "sv_cooplosekeys", "NoYes"