OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Added rumble from damage

Browse source
This commit is contained in:
Marcus Minhorst 2025-07-21 22:46:56 -04:00 • committed by Rachael Alexanderson
commit 0e621e2f30
7 changed files with 47 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/common/engine/m_haptics.cpp
View file

@ -143,6 +143,7 @@ CUSTOM_CVARD(Int, haptics_compat, HAPTCOMPAT_MATCH, CVAR_ARCHIVE | CVAR_GLOBALCO
CVARD(Bool, haptics_do_menus, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG, "allow haptic feedback for menus");
CVARD(Bool, haptics_do_world, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG, "allow haptic feedback for things acting on player");
CVARD(Bool, haptics_do_damage, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG, "allow haptic feedback for things hurting player");
CVARD(Bool, haptics_do_action, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG, "allow haptic feedback for player doing things");
// CODE --------------------------------------------------------------------

8
src/playsim/p_enemy.cpp
View file

@ -3214,7 +3214,13 @@ DEFINE_ACTION_FUNCTION(AActor, A_Pain)
sfx_id = S_FindSound(pain_amount);
}
S_Sound (self, CHAN_VOICE, 0, sfx_id, 1, ATTN_NORM);
IFVIRTUALPTR(self, AActor, PlayerHurtMakeRumble)
{
VMValue params[2] = { self, self->player->attacker.Get() };
VMCall(func, params, 2, nullptr, 0);
}
S_Sound (self, CHAN_VOICE, CHANF_NORUMBLE, sfx_id, 1, ATTN_NORM);
}
else if (self->PainSound.isvalid())
{

11
src/playsim/p_mobj.cpp
View file

@ -3288,6 +3288,15 @@ static void PlayerLandedMakeRumble(AActor* self, AActor *onmobj)
}
}
static void PlayerDiedMakeRumble(AActor* self, AActor *source)
{
IFVIRTUALPTR(self, AActor, PlayerDiedMakeRumble)
{
VMValue params[2] = { self, source };
VMCall(func, params, 2, nullptr, 0);
}
}
//===========================================================================
//
// PlayerLandedOnThing
@ -7723,7 +7732,7 @@ AActor *P_SpawnMissileXYZ (DVector3 pos, AActor *source, AActor *dest, PClassAct
}
AActor *th = Spawn (source->Level, type, pos, ALLOW_REPLACE);
// record missile's originator
if (owner == NULL) owner = source;
th->target = owner;

6
src/playsim/p_user.cpp
View file

@ -968,11 +968,11 @@ DEFINE_ACTION_FUNCTION(AActor, A_PlayerScream)
{
if (self->DeathSound != NO_SOUND)
{
S_Sound (self, CHAN_VOICE, 0, self->DeathSound, 1, ATTN_NORM);
S_Sound (self, CHAN_VOICE, CHANF_NORUMBLE, self->DeathSound, 1, ATTN_NORM);
}
else
{
S_Sound (self, CHAN_VOICE, 0, "*death", 1, ATTN_NORM);
S_Sound (self, CHAN_VOICE, CHANF_NORUMBLE, "*death", 1, ATTN_NORM);
}
return 0;
}
@ -1022,7 +1022,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_PlayerScream)
}
}
}
S_Sound (self, chan, 0, sound, 1, ATTN_NORM);
S_Sound (self, chan, CHANF_NORUMBLE, sound, 1, ATTN_NORM);
return 0;
}

1
wadsrc/static/menudef.txt
View file

@ -1264,6 +1264,7 @@ OptionMenu "HapticsOptions" protected
StaticText "$HAPMNU_OPTIONS"
Option "$HAPMNU_OPT_MENU", "haptics_do_menus", "OnOff"
Option "$HAPMNU_OPT_ACTION", "haptics_do_action", "OnOff"
Option "$HAPMNU_OPT_DAMAGE", "haptics_do_damage", "OnOff"
Option "$HAPMNU_OPT_WORLD", "haptics_do_world", "OnOff"
}

32
wadsrc/static/zscript/actors/actor.zs
View file

@ -1635,23 +1635,23 @@ class Actor : Thinker native
{
if (DeathSound)
{
A_StartSound(DeathSound, CHAN_VOICE, CHANF_DEFAULT, 1, bBoss || bFullvolDeath? ATTN_NONE : ATTN_NORM);
A_StartSound(DeathSound, CHAN_VOICE, CHANF_DEFAULT|CHANF_NORUMBLE, 1, bBoss || bFullvolDeath? ATTN_NONE : ATTN_NORM);
}
}
void A_XScream()
{
A_StartSound(player? Sound("*gibbed") : Sound("misc/gibbed"), CHAN_VOICE);
A_StartSound(player? Sound("*gibbed") : Sound("misc/gibbed"), CHAN_VOICE, CHANF_NORUMBLE);
}
void A_ActiveSound()
{
if (ActiveSound)
{
A_StartSound(ActiveSound, CHAN_VOICE);
A_StartSound(ActiveSound, CHAN_VOICE, CHANF_NORUMBLE);
}
}
virtual void PlayerLandedMakeGruntSound(actor onmobj)
{
bool grunted;
@ -1663,7 +1663,7 @@ class Actor : Thinker native
// Why should this number vary by gravity?
if (self.Vel.Z < -self.player.mo.GruntSpeed)
{
A_StartSound("*grunt", CHAN_VOICE);
A_StartSound("*grunt", CHAN_VOICE, CHANF_NORUMBLE);
grunted = true;
}
bool isliquid = (pos.Z <= floorz) && HitFloor ();
@ -1671,11 +1671,11 @@ class Actor : Thinker native
{
if (!grunted)
{
A_StartSound("*land", CHAN_AUTO);
A_StartSound("*land", CHAN_AUTO, CHANF_NORUMBLE);
}
else
{
A_StartSoundIfNotSame("*land", "*grunt", CHAN_AUTO);
A_StartSoundIfNotSame("*land", "*grunt", CHAN_AUTO, CHANF_NORUMBLE);
}
}
}
@ -1697,7 +1697,7 @@ class Actor : Thinker native
if (oldlevel < 3 && WaterLevel == 3)
{
// Our head just went under.
A_StartSound("*dive", CHAN_VOICE, attenuation: ATTN_NORM);
A_StartSound("*dive", CHAN_VOICE, CHANF_NORUMBLE, attenuation: ATTN_NORM);
}
else if (oldlevel == 3 && WaterLevel < 3)
{
@ -1705,7 +1705,7 @@ class Actor : Thinker native
if (player.air_finished > Level.maptime)
{
// We hadn't run out of air yet.
A_StartSound("*surface", CHAN_VOICE, attenuation: ATTN_NORM);
A_StartSound("*surface", CHAN_VOICE, CHANF_NORUMBLE, attenuation: ATTN_NORM);
}
// If we were running out of air, then ResetAirSupply() will play *gasp.
}
@ -1732,6 +1732,20 @@ class Actor : Thinker native
}
}
virtual void PlayerHurtMakeRumble(actor source)
{
if (!CVar.GetCVar("haptics_do_damage").GetBool()) return;
Haptics.Rumble("*pain");
}
virtual void PlayerDiedMakeRumble(actor source)
{
if (!CVar.GetCVar("haptics_do_damage").GetBool()) return;
Haptics.Rumble("*death");
}
virtual void PlayerUsedSomethingMakeRumble(int activationType, int levelNum, int lineNum, int lineSpecial)
{
if (!CVar.GetCVar("haptics_do_action").GetBool()) return;

2
wadsrc/static/zscript/actors/player/player.zs
View file

@ -835,6 +835,8 @@ class PlayerPawn : Actor
{
Super.Die (source, inflictor, dmgflags, MeansOfDeath);
if (player.mo == self) Super.PlayerDiedMakeRumble(inflictor);
if (player != NULL && player.mo == self) player.bonuscount = 0;
// [RL0] To allow voodoo zombies, don't kill the player together with voodoo dolls if the compat flag is enabled