vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

CBaseEntity: Add Ignite(), Exinguish(), IsOnFire() methods according to the

Browse source 
Source 2004 spec (controllable lifetimes etc.)
This commit is contained in:
Marco Cawthorne 2021-10-04 13:22:40 +02:00
parent 043fc1e390
commit 726332c78e
Signed by: eukara
GPG key ID: C196CD8BA993248A
3 changed files with 54 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gs-entbase/shared/baseentity.h
View file

@ -60,6 +60,15 @@ class CBaseEntity
string m_parent;
/* fire */
entity m_eBurner;
int m_iBurnWeapon;
float m_flBurnTime;
float m_flBurnNext;
nonvirtual void(entity, float, int) Ignite;
nonvirtual void(void) Extinguish;
nonvirtual int(void) IsOnFire;
/* Reliable APIs */
nonvirtual vector(void) GetSpawnOrigin;
nonvirtual vector(void) GetSpawnAngles;

44
src/gs-entbase/shared/baseentity.qc
View file

@ -613,6 +613,15 @@ CBaseEntity::Input(entity eAct, string strInput, string strData)
case "EnableShadow":
effects &= ~EF_NOSHADOW;
break;
case "Ignite":
Ignite(eAct, 5000, 0);
break;
case "IgniteLifetime":
Ignite(eAct, stof(strData), 0);
break;
case "Extinguish":
Extinguish();
break;
default:
if (strData != "")
print(sprintf("^2%s::^3Input^7: Receives input %s from %s with data %s\n",
@ -770,6 +779,29 @@ CBaseEntity::Death(void)
}
/* Burning, fire, flames, etc. */
void
CBaseEntity::Ignite(entity attacker, float flLifetime, int iWeapon)
{
flags |= FL_ONFIRE;
m_eBurner = attacker;
m_iBurnWeapon = iWeapon;
m_flBurnTime = time + flLifetime;
}
void
CBaseEntity::Extinguish(void)
{
flags &= ~FL_ONFIRE;
m_eBurner = __NULL__;
m_iBurnWeapon =
m_flBurnTime = 0;
}
int
CBaseEntity::IsOnFire(void)
{
return (flags & FL_ONFIRE) ? TRUE : FALSE;
}
void
CBaseEntity::EvaluateEntity(void)
{
@ -797,6 +829,18 @@ CBaseEntity::EvaluateEntity(void)
void
CBaseEntity::ParentUpdate(void)
{
/* TODO: Move out */
if (flags & FL_ONFIRE) {
if (m_flBurnNext < time) {
if (time > m_flBurnTime) {
flags &= ~FL_ONFIRE;
}
Damage_Apply(this, m_eBurner, 5, m_iBurnWeapon, DMG_BURN);
m_flBurnNext = time + 0.5f;
}
}
EvaluateEntity();
frame1time += frametime;

2
src/shared/flags.h
View file

@ -39,5 +39,5 @@
#define FL_USE_RELEASED (1<<20)
#define FL_NOATTACK (1<<21)
#define FL_ONUSABLE (1<<22)
#define FL_RESERVED2 (1<<23)
#define FL_ONFIRE (1<<23)
#define FL_RESERVED3 (1<<15)