reHLDS/ReGameDLL_CS
2
0
Fork 0
mirror of https://github.com/s1lentq/ReGameDLL_CS.git synced 2024-12-27 07:05:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use CSEntity member to hold last inflictor from TakeDamage (#896)

Browse Source
This commit is contained in:
Francisco Muñoz 2023-11-26 01:21:04 -03:00 committed by GitHub
parent e3d70d2b14
commit 9ab1589d32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
regamedll/dlls/basemonster.cpp
View File

@ -451,17 +451,13 @@ BOOL CBaseMonster::TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, f
if (pev->health <= 0.0f)
{
g_pevLastInflictor = pevInflictor;
if (bitsDamageType & DMG_ALWAYSGIB)
Killed(pevAttacker, GIB_ALWAYS);
KilledInflicted(pevInflictor, pevAttacker, GIB_ALWAYS);
else if (bitsDamageType & DMG_NEVERGIB)
Killed(pevAttacker, GIB_NEVER);
KilledInflicted(pevInflictor, pevAttacker, GIB_NEVER);
else
Killed(pevAttacker, GIB_NORMAL);
KilledInflicted(pevInflictor, pevAttacker, GIB_NORMAL);
g_pevLastInflictor = nullptr;
return FALSE;
}
if ((pev->flags & FL_MONSTER) && !FNullEnt(pevAttacker))

4
regamedll/dlls/cbase.cpp
View File

@ -697,7 +697,11 @@ BOOL CBaseEntity::TakeDamage(entvars_t *pevInflictor, entvars_t *pevAttacker, fl
pev->health -= flDamage;
if (pev->health <= 0)
{
#ifdef REGAMEDLL_FIXES
KilledInflicted(pevInflictor, pevAttacker, GIB_NORMAL);
#else
Killed(pevAttacker, GIB_NORMAL);
#endif
return FALSE;
}

3
regamedll/dlls/cbase.h
View File

@ -246,6 +246,9 @@ public:
void ResetDmgPenetrationLevel();
int GetDmgPenetrationLevel() const;
void KilledInflicted(entvars_t *pevInflictor, entvars_t *pevAttacker, int iGib);
entvars_t *GetLastInflictor();
#ifdef REGAMEDLL_API
CCSEntity *m_pEntity;
CCSEntity *CSEntity() const;

8
regamedll/dlls/player.cpp
View File

@ -82,7 +82,9 @@ const char *CDeadHEV::m_szPoses[] =
"deadtable"
};
#ifndef REGAMEDLL_API
entvars_t *g_pevLastInflictor;
#endif
LINK_ENTITY_TO_CLASS(player, CBasePlayer, CCSPlayer)
@ -2130,7 +2132,7 @@ void EXT_FUNC CBasePlayer::__API_HOOK(Killed)(entvars_t *pevAttacker, int iGib)
if (IsBot() && IsBlind()) // dystopm: shouldn't be !IsBot() ?
wasBlind = true;
TheCareerTasks->HandleEnemyKill(wasBlind, GetKillerWeaponName(g_pevLastInflictor, pevAttacker), m_bHeadshotKilled, killerHasShield, pAttacker, this); // last 2 param swapped to match function definition
TheCareerTasks->HandleEnemyKill(wasBlind, GetKillerWeaponName(GetLastInflictor(), pevAttacker), m_bHeadshotKilled, killerHasShield, pAttacker, this); // last 2 param swapped to match function definition
}
}
#endif
@ -2161,7 +2163,7 @@ void EXT_FUNC CBasePlayer::__API_HOOK(Killed)(entvars_t *pevAttacker, int iGib)
{
if (TheCareerTasks)
{
TheCareerTasks->HandleEnemyKill(wasBlind, GetKillerWeaponName(g_pevLastInflictor, pevAttacker), m_bHeadshotKilled, killerHasShield, this, pPlayer);
TheCareerTasks->HandleEnemyKill(wasBlind, GetKillerWeaponName(GetLastInflictor(), pevAttacker), m_bHeadshotKilled, killerHasShield, this, pPlayer);
}
}
}
@ -2171,7 +2173,7 @@ void EXT_FUNC CBasePlayer::__API_HOOK(Killed)(entvars_t *pevAttacker, int iGib)
if (!m_bKilledByBomb)
{
g_pGameRules->PlayerKilled(this, pevAttacker, g_pevLastInflictor);
g_pGameRules->PlayerKilled(this, pevAttacker, GetLastInflictor());
}
MESSAGE_BEGIN(MSG_ONE, gmsgNVGToggle, nullptr, pev);

2
regamedll/dlls/player.h
View File

@ -975,7 +975,9 @@ inline CBasePlayer *UTIL_PlayerByIndexSafe(int playerIndex)
return pPlayer;
}
#ifndef REGAMEDLL_API
extern entvars_t *g_pevLastInflictor;
#endif
extern CBaseEntity *g_pLastSpawn;
extern CBaseEntity *g_pLastCTSpawn;
extern CBaseEntity *g_pLastTerroristSpawn;

35
regamedll/public/regamedll/API/CSEntity.h
View File

@ -46,12 +46,13 @@ public:
public:
CBaseEntity *m_pContainingEntity;
unsigned char m_ucDmgPenetrationLevel; // penetration level of the damage caused by the inflictor
entvars_t *m_pevLastInflictor;
private:
#if defined(_MSC_VER)
#pragma region reserve_data_Region
#endif
char CCSEntity_Reserve[0x3FFF];
char CCSEntity_Reserve[0x3FF7];
virtual void func_reserve1() {};
virtual void func_reserve2() {};
@ -91,26 +92,52 @@ private:
inline void CBaseEntity::SetDmgPenetrationLevel(int iPenetrationLevel)
{
#ifdef REGAMEDLL_API
m_pEntity->m_ucDmgPenetrationLevel = iPenetrationLevel;
CSEntity()->m_ucDmgPenetrationLevel = iPenetrationLevel;
#endif
}
inline void CBaseEntity::ResetDmgPenetrationLevel()
{
#ifdef REGAMEDLL_API
m_pEntity->m_ucDmgPenetrationLevel = 0;
CSEntity()->m_ucDmgPenetrationLevel = 0;
#endif
}
inline int CBaseEntity::GetDmgPenetrationLevel() const
{
#ifdef REGAMEDLL_API
return m_pEntity->m_ucDmgPenetrationLevel;
return CSEntity()->m_ucDmgPenetrationLevel;
#else
return 0;
#endif
}
inline void CBaseEntity::KilledInflicted(entvars_t* pevInflictor, entvars_t *pevAttacker, int iGib)
{
#ifdef REGAMEDLL_API
CSEntity()->m_pevLastInflictor = pevInflictor;
#else
g_pevLastInflictor = pevInflictor;
#endif
Killed(pevAttacker, iGib);
#ifdef REGAMEDLL_API
CSEntity()->m_pevLastInflictor = nullptr;
#else
g_pevLastInflictor = nullptr;
#endif
}
inline entvars_t* CBaseEntity::GetLastInflictor()
{
#ifdef REGAMEDLL_API
return CSEntity()->m_pevLastInflictor;
#else
return g_pevLastInflictor;
#endif
}
class CCSDelay: public CCSEntity
{
public: