Skip to content

Little code cleaning: g_vecAttackDir #831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wopox1337 merged 4 commits into from
Jul 11, 2023
Merged

Little code cleaning: g_vecAttackDir #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcf1f6b
Tiny code cleaning
dystopm May 16, 2023
8cc3477
Skip REGAMEDLL_FIXES
dystopm Jul 10, 2023
404ed09
UTIL_BloodDrips: remove useless `direction` param
wopox1337 Jul 10, 2023
1b63599
Fix test demo (RANDOM_FLOAT inside UTIL_RandomBloodVector should be c…
s1lentq Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions regamedll/dlls/effects.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion regamedll/dlls/player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6515,7 +6515,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++)
{
Expand Down
2 changes: 1 addition & 1 deletion regamedll/dlls/util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion regamedll/dlls/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion regamedll/dlls/weapons.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
⚡