Little code cleaning: g_vecAttackDir (#831)

dystopm · wopox1337 · s1lentq · web-flow · commit 6375ea550458 · 2023-07-11T03:01:53.000+03:00
* Tiny code cleaning

* Skip REGAMEDLL_FIXES

* UTIL_BloodDrips: remove useless `direction` param

* Fix test demo (RANDOM_FLOAT inside UTIL_RandomBloodVector should be called for testdemo)

---------

Co-authored-by: Sergey Shorokhov &lt;wopox1337@ya.ru&gt;
Co-authored-by: s1lentq &lt;s1lentsk@yandex.ru&gt;
diff --git a/regamedll/dlls/effects.cpp b/regamedll/dlls/effects.cpp
@@ -1737,10 +1737,12 @@ Vector CBlood::BloodPosition(CBaseEntity *pActivator)
 
 void CBlood::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value)
 {
+	const Vector direction = Direction();
+
 	if (pev->spawnflags & SF_BLOOD_STREAM)
-		UTIL_BloodStream(BloodPosition(pActivator), Direction(), (Color() == BLOOD_COLOR_RED) ? 70 : Color(), int(BloodAmount()));
+		UTIL_BloodStream(BloodPosition(pActivator), direction, (Color() == BLOOD_COLOR_RED) ? 70 : Color(), int(BloodAmount()));
 	else
-		UTIL_BloodDrips(BloodPosition(pActivator), Direction(), Color(), int(BloodAmount()));
+		UTIL_BloodDrips(BloodPosition(pActivator), Color(), int(BloodAmount()));
 
 	if (pev->spawnflags & SF_BLOOD_DECAL)
 	{
diff --git a/regamedll/dlls/player.cpp b/regamedll/dlls/player.cpp
@@ -6596,7 +6596,7 @@ void CBasePlayer::CheatImpulseCommands(int iImpulse)
 			TraceResult tr;
 			Vector dir(0, 0, 1);
 
-			UTIL_BloodDrips(pev->origin, dir, BLOOD_COLOR_RED, 2000);
+			UTIL_BloodDrips(pev->origin, BLOOD_COLOR_RED, 2000);
 
 			for (int r = 1; r < 4; r++)
 			{
diff --git a/regamedll/dlls/util.cpp b/regamedll/dlls/util.cpp
@@ -1056,7 +1056,7 @@ void UTIL_BloodStream(const Vector &origin, const Vector &direction, int color,
 	MESSAGE_END();
 }
 
-void UTIL_BloodDrips(const Vector &origin, const Vector &direction, int color, int amount)
+void UTIL_BloodDrips(const Vector &origin, int color, int amount)
 {
 	if (!UTIL_ShouldShowBlood(color))
 		return;
diff --git a/regamedll/dlls/util.h b/regamedll/dlls/util.h
@@ -262,7 +262,7 @@ bool UTIL_IsMasterTriggered(string_t sMaster, CBaseEntity *pActivator);
 BOOL UTIL_ShouldShowBlood(int color);
 int UTIL_PointContents(const Vector &vec);
 void UTIL_BloodStream(const Vector &origin, const Vector &direction, int color, int amount);
-void UTIL_BloodDrips(const Vector &origin, const Vector &direction, int color, int amount);
+void UTIL_BloodDrips(const Vector &origin, int color, int amount);
 Vector UTIL_RandomBloodVector();
 void UTIL_BloodDecalTrace(TraceResult *pTrace, int bloodColor);
 void UTIL_DecalTrace(TraceResult *pTrace, int decalNumber);
diff --git a/regamedll/dlls/weapons.cpp b/regamedll/dlls/weapons.cpp
@@ -112,7 +112,7 @@ void AddMultiDamage(entvars_t *pevInflictor, CBaseEntity *pEntity, float flDamag
 
 void SpawnBlood(Vector vecSpot, int bloodColor, float flDamage)
 {
-	UTIL_BloodDrips(vecSpot, g_vecAttackDir, bloodColor, int(flDamage));
+	UTIL_BloodDrips(vecSpot, bloodColor, int(flDamage));
 }
 
 NOXREF int DamageDecal(CBaseEntity *pEntity, int bitsDamageType)

Original file line number	Diff line number	Diff line change
`@@ -1737,10 +1737,12 @@ Vector CBlood::BloodPosition(CBaseEntity *pActivator)`
`1737`	`1737`
`1738`	`1738`	`void CBlood::Use(CBaseEntity pActivator, CBaseEntity pCaller, USE_TYPE useType, float value)`
`1739`	`1739`	`{`
	`1740`	`+ const Vector direction = Direction();`
	`1741`	`+`
`1740`	`1742`	`if (pev->spawnflags & SF_BLOOD_STREAM)`
`1741`		`- UTIL_BloodStream(BloodPosition(pActivator), Direction(), (Color() == BLOOD_COLOR_RED) ? 70 : Color(), int(BloodAmount()));`
	`1743`	`+ UTIL_BloodStream(BloodPosition(pActivator), direction, (Color() == BLOOD_COLOR_RED) ? 70 : Color(), int(BloodAmount()));`
`1742`	`1744`	`else`
`1743`		`- UTIL_BloodDrips(BloodPosition(pActivator), Direction(), Color(), int(BloodAmount()));`
	`1745`	`+ UTIL_BloodDrips(BloodPosition(pActivator), Color(), int(BloodAmount()));`
`1744`	`1746`
`1745`	`1747`	`if (pev->spawnflags & SF_BLOOD_DECAL)`
`1746`	`1748`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6596,7 +6596,7 @@ void CBasePlayer::CheatImpulseCommands(int iImpulse)`
`6596`	`6596`	`TraceResult tr;`
`6597`	`6597`	`Vector dir(0, 0, 1);`
`6598`	`6598`
`6599`		`- UTIL_BloodDrips(pev->origin, dir, BLOOD_COLOR_RED, 2000);`
	`6599`	`+ UTIL_BloodDrips(pev->origin, BLOOD_COLOR_RED, 2000);`
`6600`	`6600`
`6601`	`6601`	`for (int r = 1; r < 4; r++)`
`6602`	`6602`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1056,7 +1056,7 @@ void UTIL_BloodStream(const Vector &origin, const Vector &direction, int color,`
`1056`	`1056`	`MESSAGE_END();`
`1057`	`1057`	`}`
`1058`	`1058`
`1059`		`-void UTIL_BloodDrips(const Vector &origin, const Vector &direction, int color, int amount)`
	`1059`	`+void UTIL_BloodDrips(const Vector &origin, int color, int amount)`
`1060`	`1060`	`{`
`1061`	`1061`	`if (!UTIL_ShouldShowBlood(color))`
`1062`	`1062`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ void AddMultiDamage(entvars_t pevInflictor, CBaseEntity pEntity, float flDamag`
`112`	`112`
`113`	`113`	`void SpawnBlood(Vector vecSpot, int bloodColor, float flDamage)`
`114`	`114`	`{`
`115`		`- UTIL_BloodDrips(vecSpot, g_vecAttackDir, bloodColor, int(flDamage));`
	`115`	`+ UTIL_BloodDrips(vecSpot, bloodColor, int(flDamage));`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`NOXREF int DamageDecal(CBaseEntity *pEntity, int bitsDamageType)`