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

NSSurfacePropEntity: Keep track if .health is ever set manually, take that

Browse source 
and PropData info into account for determining if any child classes will
'break' by default
This commit is contained in:
Marco Cawthorne 2021-11-21 03:57:18 +01:00
parent eb85121716
commit a2f8fd0a5d
Signed by: eukara
GPG key ID: C196CD8BA993248A
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gs-entbase/shared/NSSurfacePropEntity.qc
View file

@ -90,8 +90,19 @@ NSSurfacePropEntity::IsOnFire(void)
void void
NSSurfacePropEntity::Respawn(void) NSSurfacePropEntity::Respawn(void)
{ {
float sh = GetSpawnHealth();
NSRenderableEntity::Respawn(); NSRenderableEntity::Respawn();
health = GetSpawnHealth();
if (HasPropData() && sh == -1) {
health = (float)GetPropData(PROPINFO_HEALTH);
} else {
health = sh;
}
if (health > 0)
takedamage = DAMAGE_YES;
else
takedamage = DAMAGE_NO;
} }
void void
@ -263,6 +274,7 @@ NSSurfacePropEntity::NSSurfacePropEntity(void)
#ifdef SERVER #ifdef SERVER
m_iPropData = -1; m_iPropData = -1;
m_iMaterial = -1; m_iMaterial = -1;
health = -1;
super::NSRenderableEntity(); super::NSRenderableEntity();