Merge pull request #12 from dystopm/mp-dying-time-cvar

Fix death animation when mp_dying_time < 3.0 depending on animation
s1lentq · Jul 12, 2023 · 9dc7879 · 9dc7879
2 parents 68d29bf + 449a9c5
commit 9dc7879
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 6 deletions.
diff --git a/regamedll/common/const.h b/regamedll/common/const.h
@@ -100,6 +100,7 @@
 // Starting from BIT(16) to reserve space for more flags for Engine
 #define FTRACE_BULLET				BIT(16)
 #define FTRACE_FLASH				BIT(17)
+#define FTRACE_KNIFE				BIT(18)
 
 // walkmove modes
 #define WALKMOVE_NORMAL             0 // normal walkmove

diff --git a/regamedll/dlls/game.h b/regamedll/dlls/game.h
@@ -192,10 +192,9 @@ extern cvar_t sv_enablebunnyhopping;
 extern cvar_t plant_c4_anywhere;
 extern cvar_t give_c4_frags;
 extern cvar_t hostages_rescued_ratio;
-
+extern cvar_t legacy_vehicle_block;
 extern cvar_t dying_time;
 
-extern cvar_t legacy_vehicle_block;
 #endif
 
 extern cvar_t scoreboard_showmoney;

diff --git a/regamedll/dlls/player.cpp b/regamedll/dlls/player.cpp
@@ -8818,9 +8818,7 @@ void CBasePlayer::SpawnClientSideCorpse()
 	if (pev->effects & EF_NODRAW)
 		return;
 
-	// do not make a corpse if the player goes to respawn.
-	if (pev->deadflag == DEAD_RESPAWNABLE)
-		return;
+	// deadflag == DEAD_RESPAWNABLE already checked before
 #endif
 
 #ifdef REGAMEDLL_ADD
@@ -8830,6 +8828,41 @@ void CBasePlayer::SpawnClientSideCorpse()
 
 	char *infobuffer = GET_INFO_BUFFER(edict());
 	char *pModel = GET_KEY_VALUE(infobuffer, "model");
+	float timeDiff = pev->animtime - gpGlobals->time;
+
+#ifdef REGAMEDLL_ADD 
+	if (CGameRules::GetDyingTime() < DEATH_ANIMATION_TIME) // a short time, timeDiff estimates to be small
+	{
+		float animDuration = -1.0;
+
+		studiohdr_t *pstudiohdr = (studiohdr_t *)GET_MODEL_PTR(ENT(pev));
+		if (pstudiohdr && pev->sequence < pstudiohdr->numseq) // model ptr and sequence validation
+		{
+			// get current sequence time
+			mstudioseqdesc_t *pseqdesc = (mstudioseqdesc_t *)((byte *)pstudiohdr + pstudiohdr->seqindex) + int(pev->sequence);
+			animDuration = pseqdesc->numframes / pseqdesc->fps; 
+		}
+
+		if (animDuration <= 0.0) 
+		{
+			// in case of failure
+			animDuration = DEATH_ANIMATION_TIME;
+		}
+
+		// client receives a negative value 
+		animDuration *= -1.0; 
+
+		if (animDuration < timeDiff) // reasonable way to fix client side unfinished sequence bug
+		{
+			// by some reason, if client receives a value less 
+			// than "(negative current sequence time) * 100" 
+			// animation will play visually awkward
+			// at this function call time, player death animation 
+			// has already finished so we can safely fake it
+			timeDiff = animDuration; 
+		}
+	}
+#endif
 
 	MESSAGE_BEGIN(MSG_ALL, gmsgSendCorpse);
 		WRITE_STRING(pModel);
@@ -8839,14 +8872,17 @@ void CBasePlayer::SpawnClientSideCorpse()
 		WRITE_COORD(pev->angles.x);
 		WRITE_COORD(pev->angles.y);
 		WRITE_COORD(pev->angles.z);
-		WRITE_LONG((pev->animtime - gpGlobals->time) * 100);
+		WRITE_LONG(timeDiff * 100);
 		WRITE_BYTE(pev->sequence);
 		WRITE_BYTE(pev->body);
 		WRITE_BYTE(m_iTeam);
 		WRITE_BYTE(entindex());
 	MESSAGE_END();
 
+#ifndef REGAMEDLL_FIXES
+	// already defined in StartDeathCam
 	m_canSwitchObserverModes = true;
+#endif 
 
 	if (TheTutor)
 	{

diff --git a/regamedll/dlls/wpn_shared/wpn_knife.cpp b/regamedll/dlls/wpn_shared/wpn_knife.cpp
@@ -129,6 +129,9 @@ void FindHullIntersection(const Vector &vecSrc, TraceResult &tr, float *mins, fl
 	distance = 1e6f;
 
 	vecHullEnd = vecSrc + ((vecHullEnd - vecSrc) * 2);
+#ifdef REGAMEDLL_ADD
+	gpGlobals->trace_flags = FTRACE_KNIFE;
+#endif
 	UTIL_TraceLine(vecSrc, vecHullEnd, dont_ignore_monsters, pEntity, &tmpTrace);
 
 	if (tmpTrace.flFraction < 1.0f)
@@ -147,6 +150,9 @@ void FindHullIntersection(const Vector &vecSrc, TraceResult &tr, float *mins, fl
 				vecEnd.y = vecHullEnd.y + minmaxs[j][1];
 				vecEnd.z = vecHullEnd.z + minmaxs[k][2];
 
+#ifdef REGAMEDLL_ADD
+				gpGlobals->trace_flags = FTRACE_KNIFE;
+#endif
 				UTIL_TraceLine(vecSrc, vecEnd, dont_ignore_monsters, pEntity, &tmpTrace);
 
 				if (tmpTrace.flFraction < 1.0f)
@@ -274,11 +280,21 @@ BOOL CKnife::Swing(BOOL fFirst)
 	vecSrc = m_pPlayer->GetGunPosition();
 	vecEnd = vecSrc + gpGlobals->v_forward * KnifeSwingDistance();
 
+#ifdef REGAMEDLL_ADD
+	gpGlobals->trace_flags = FTRACE_KNIFE;
+#endif
 	UTIL_TraceLine(vecSrc, vecEnd, dont_ignore_monsters, m_pPlayer->edict(), &tr);
 
 	if (tr.flFraction >= 1.0f)
 	{
+#ifdef REGAMEDLL_ADD
+		gpGlobals->trace_flags = FTRACE_KNIFE;
+#endif
 		UTIL_TraceHull(vecSrc, vecEnd, dont_ignore_monsters, head_hull, m_pPlayer->edict(), &tr);
+#ifdef REGAMEDLL_ADD
+		// We manually reset it because Engine doesn't unlike TraceLine
+		gpGlobals->trace_flags = 0;
+#endif
 
 		if (tr.flFraction < 1.0f)
 		{
@@ -457,11 +473,21 @@ BOOL CKnife::Stab(BOOL fFirst)
 	vecSrc = m_pPlayer->GetGunPosition();
 	vecEnd = vecSrc + gpGlobals->v_forward * KnifeStabDistance();
 
+#ifdef REGAMEDLL_ADD
+	gpGlobals->trace_flags = FTRACE_KNIFE;
+#endif
 	UTIL_TraceLine(vecSrc, vecEnd, dont_ignore_monsters, m_pPlayer->edict(), &tr);
 
 	if (tr.flFraction >= 1.0f)
 	{
+#ifdef REGAMEDLL_ADD
+		gpGlobals->trace_flags = FTRACE_KNIFE;
+#endif
 		UTIL_TraceHull(vecSrc, vecEnd, dont_ignore_monsters, head_hull, m_pPlayer->edict(), &tr);
+#ifdef REGAMEDLL_ADD
+		// We manually reset it because Engine doesn't unlike TraceLine
+		gpGlobals->trace_flags = 0;
+#endif
 
 		if (tr.flFraction < 1.0f)
 		{