mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-24 13:11:33 +00:00
- add sv_instantreaction dmflag
This commit is contained in:
parent
4ff72e937f
commit
476e59fbab
5 changed files with 8 additions and 2 deletions
|
@ -555,6 +555,7 @@ CVAR (Flag, sv_cooplosearmor, dmflags, DF_COOP_LOSE_ARMOR);
|
|||
CVAR (Flag, sv_cooplosepowerups, dmflags, DF_COOP_LOSE_POWERUPS);
|
||||
CVAR (Flag, sv_cooploseammo, dmflags, DF_COOP_LOSE_AMMO);
|
||||
CVAR (Flag, sv_coophalveammo, dmflags, DF_COOP_HALVE_AMMO);
|
||||
CVAR (Flag, sv_instantreaction, dmflags, DF_INSTANT_REACTION);
|
||||
|
||||
// Some (hopefully cleaner) interface to these settings.
|
||||
CVAR (Mask, sv_crouch, dmflags, DF_NO_CROUCH|DF_YES_CROUCH);
|
||||
|
|
|
@ -136,6 +136,7 @@ enum
|
|||
DF_COOP_LOSE_POWERUPS = 1 << 28, // Lose powerups when respawning in coop
|
||||
DF_COOP_LOSE_AMMO = 1 << 29, // Lose ammo when respawning in coop
|
||||
DF_COOP_HALVE_AMMO = 1 << 30, // Lose half your ammo when respawning in coop (but not less than the normal starting amount)
|
||||
DF_INSTANT_REACTION = 1 << 31, // Monsters react instantly
|
||||
};
|
||||
|
||||
// [BC] More dmflags. w00p!
|
||||
|
|
|
@ -4477,7 +4477,8 @@ void ConstructActor(AActor *actor, const DVector3 &pos, bool SpawningMapThing)
|
|||
|
||||
FRandom &rng = Level->BotInfo.m_Thinking ? pr_botspawnmobj : pr_spawnmobj;
|
||||
|
||||
if (!!G_SkillProperty(SKILLP_InstantReaction) && actor->flags3 & MF3_ISMONSTER)
|
||||
if (!!(G_SkillProperty(SKILLP_InstantReaction) || !!(dmflags & DF_INSTANT_REACTION))
|
||||
&& actor->flags3 & MF3_ISMONSTER)
|
||||
actor->reactiontime = 0;
|
||||
|
||||
if (actor->flags3 & MF3_ISMONSTER)
|
||||
|
|
|
@ -1174,9 +1174,11 @@ static void S_AddSNDINFO (int lump)
|
|||
if (lump >= 0)
|
||||
{
|
||||
// do not set the alias if a later WAD defines its own music of this name
|
||||
// internal files (up to and including iwads) can always be set for musicalias
|
||||
int file = fileSystem.GetFileContainer(lump);
|
||||
int sndifile = fileSystem.GetFileContainer(sc.LumpNum);
|
||||
if (!(sndifile == 1 && file <= fileSystem.GetIwadNum()) && (file > sndifile))
|
||||
if ( (file > sndifile) &&
|
||||
!(sndifile <= fileSystem.GetIwadNum() && file <= fileSystem.GetIwadNum()) )
|
||||
{
|
||||
sc.MustGetString();
|
||||
continue;
|
||||
|
|
|
@ -1641,6 +1641,7 @@ OptionMenu GameplayOptions protected
|
|||
Option "$GMPLYMNU_ITEMSRESPAWN", "sv_itemrespawn", "YesNo"
|
||||
Option "$GMPLYMNU_SUPERRESPAWN", "sv_respawnsuper", "YesNo"
|
||||
Option "$GMPLYMNU_FASTMONSTERS", "sv_fastmonsters", "YesNo"
|
||||
Option "$GMPLYMNU_INSTANTREACTION", "sv_instantreaction", "YesNo"
|
||||
Option "$GMPLYMNU_DEGENERATION", "sv_degeneration", "YesNo"
|
||||
Option "$GMPLYMNU_NOAUTOAIM", "sv_noautoaim", "NoYes"
|
||||
Option "$GMPLYMNU_ALLOWSUICIDE", "sv_disallowsuicide", "NoYes"
|
||||
|
|
Loading…
Reference in a new issue