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

func_illusionary/wall: Only makestatic() when our rendermode is RM_NORMAL

Browse source
This commit is contained in:
Marco Cawthorne 2022-08-05 19:54:34 -07:00
parent 8a9c26daef
commit 81b4bc042f
Signed by: eukara
GPG key ID: CE2032F0A2882A22
4 changed files with 67 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gs-entbase/shared/func_illusionary.qc
View file

@ -49,7 +49,7 @@ func_illusionary:NSRenderableEntity
float
func_illusionary::SendEntity(entity pvsent, float fl)
{
if (targetname)
if ((GetRenderMode() != RM_NORMAL) || (targetname))
return super::SendEntity(pvsent, fl);
else
return (0);
@ -114,7 +114,7 @@ func_illusionary::Init(void)
super::Init();
/* this entity is being controlled by the server, remove it */
if (targetname) {
if ((GetRenderMode() != RM_NORMAL) || (targetname)) {
Destroy();
return;
}
@ -137,4 +137,7 @@ func_illusionary::Init(void)
void
func_illusionary::func_illusionary(void)
{
#ifdef CLIENT
isCSQC = true;
#endif
}

8
src/gs-entbase/shared/func_wall.qc
View file

@ -49,7 +49,8 @@ func_wall:NSRenderableEntity
float
func_wall::SendEntity(entity pvsent, float fl)
{
if (targetname)
/* if we have a target name, act norm */
if ((GetRenderMode() != RM_NORMAL) || (targetname))
return super::SendEntity(pvsent, fl);
else
return (0);
@ -109,7 +110,7 @@ func_wall::Init(void)
super::Init();
/* this entity is being controlled by the server, remove it */
if (targetname) {
if ((GetRenderMode() != RM_NORMAL) && (targetname)) {
Destroy();
return;
}
@ -128,4 +129,7 @@ func_wall::Init(void)
void
func_wall::func_wall(void)
{
#ifdef CLIENT
isCSQC = true;
#endif
}

10
src/shared/NSRenderableEntity.h
View file

@ -145,6 +145,16 @@ class NSRenderableEntity:NSEntity
nonvirtual void(float) SetBoneControl4;
nonvirtual void(float) SetBoneControl5;
nonvirtual float(void) GetRenderMode;
nonvirtual float(void) GetRenderFX;
nonvirtual float(void) GetRenderAmt;
nonvirtual vector(void) GetRenderColor;
nonvirtual float(void) GetBoneControl1;
nonvirtual float(void) GetBoneControl2;
nonvirtual float(void) GetBoneControl3;
nonvirtual float(void) GetBoneControl4;
nonvirtual float(void) GetBoneControl5;
#ifdef CLIENT
nonvirtual void(void) RenderFXPass;
#else

46
src/shared/NSRenderableEntity.qc
View file

@ -831,6 +831,52 @@ NSRenderableEntity::SetBoneControl5(float val)
m_flBoneControl5 = val;
}
float
NSRenderableEntity::GetRenderMode(void)
{
return m_iRenderMode;
}
float
NSRenderableEntity::GetRenderFX(void)
{
return m_iRenderFX;
}
float
NSRenderableEntity::GetRenderAmt(void)
{
return m_flRenderAmt;
}
vector
NSRenderableEntity::GetRenderColor(void)
{
return m_vecRenderColor;
}
float
NSRenderableEntity::GetBoneControl1(void)
{
return m_flBoneControl1;
}
float
NSRenderableEntity::GetBoneControl2(void)
{
return m_flBoneControl2;
}
float
NSRenderableEntity::GetBoneControl3(void)
{
return m_flBoneControl3;
}
float
NSRenderableEntity::GetBoneControl4(void)
{
return m_flBoneControl4;
}
float
NSRenderableEntity::GetBoneControl5(void)
{
return m_flBoneControl5;
}
#ifdef SERVER
void
NSRenderableEntity::Save(float handle)