zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-29 15:22:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add sv_noextraammo. When set to true, disables that weird hardcoded behavior from original Doom that gives extra ammo when picking up weapons in deathmatch

Browse source
This commit is contained in:
nashmuhandes 2022-09-16 08:34:46 +08:00 committed by Rachael Alexanderson
parent c87e87365d
commit 7ce364bf0f
4 changed files with 4 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

@ -565,6 +565,7 @@ CVAR (Flag, sv_respawnsuper, dmflags2, DF2_RESPAWN_SUPER);
CVAR (Flag, sv_nothingspawn, dmflags2, DF2_NO_COOP_THING_SPAWN); CVAR (Flag, sv_nothingspawn, dmflags2, DF2_NO_COOP_THING_SPAWN);
CVAR (Flag, sv_alwaysspawnmulti, dmflags2, DF2_ALWAYS_SPAWN_MULTI); CVAR (Flag, sv_alwaysspawnmulti, dmflags2, DF2_ALWAYS_SPAWN_MULTI);
CVAR (Flag, sv_novertspread, dmflags2, DF2_NOVERTSPREAD); CVAR (Flag, sv_novertspread, dmflags2, DF2_NOVERTSPREAD);
CVAR (Flag, sv_noextraammo, dmflags2, DF2_NO_EXTRA_AMMO);
//========================================================================== //==========================================================================
// //

1
src/doomdef.h
View file

@ -173,6 +173,7 @@ enum
DF2_NO_COOP_THING_SPAWN = 1 << 28, // Don't spawn multiplayer things in coop games DF2_NO_COOP_THING_SPAWN = 1 << 28, // Don't spawn multiplayer things in coop games
DF2_ALWAYS_SPAWN_MULTI = 1 << 29, // Always spawn multiplayer items DF2_ALWAYS_SPAWN_MULTI = 1 << 29, // Always spawn multiplayer items
DF2_NOVERTSPREAD = 1 << 30, // Don't allow vertical spread for hitscan weapons (excluding ssg) DF2_NOVERTSPREAD = 1 << 30, // Don't allow vertical spread for hitscan weapons (excluding ssg)
DF2_NO_EXTRA_AMMO = 1 << 31, // Don't add extra ammo when picking up weapons (like in original Doom)
}; };
// [RH] Compatibility flags. // [RH] Compatibility flags.

1
wadsrc/static/menudef.txt
View file

@ -1683,6 +1683,7 @@ OptionMenu DeathmatchOptions protected
Option "$GMPLYMNU_LOSEFRAG", "sv_losefrag", "YesNo" Option "$GMPLYMNU_LOSEFRAG", "sv_losefrag", "YesNo"
Option "$GMPLYMNU_KEEPFRAGS", "sv_keepfrags", "YesNo" Option "$GMPLYMNU_KEEPFRAGS", "sv_keepfrags", "YesNo"
Option "$GMPLYMNU_NOTEAMSWITCH", "sv_noteamswitch", "YesNo" Option "$GMPLYMNU_NOTEAMSWITCH", "sv_noteamswitch", "YesNo"
Option "$GMPLYMNU_NOEXTRAAMMO", "sv_noextraammo", "NoYes"
Class "GameplayMenu" Class "GameplayMenu"
} }

2
wadsrc/static/zscript/actors/inventory/weapons.zs
View file

@ -742,7 +742,7 @@ class Weapon : StateProvider
// [BC] This behavior is from the original Doom. Give 5/2 times as much ammoitem when // [BC] This behavior is from the original Doom. Give 5/2 times as much ammoitem when
// we pick up a weapon in deathmatch. // we pick up a weapon in deathmatch.
if (( deathmatch ) && ( gameinfo.gametype & GAME_DoomChex )) if (( deathmatch && !sv_noextraammo ) && ( gameinfo.gametype & GAME_DoomChex ))
amount = amount * 5 / 2; amount = amount * 5 / 2;
// extra ammoitem in baby mode and nightmare mode // extra ammoitem in baby mode and nightmare mode