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

func_wall/func_illusionary: get rid of this optimisation that messes with odd world data

Browse source
This commit is contained in:
Marco Cawthorne 2023-09-22 14:38:52 -07:00
parent a90296864b
commit 069557f350
Signed by: eukara
GPG key ID: CE2032F0A2882A22
2 changed files with 7 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,32 +27,20 @@ On idTech 2 BSPs, it will change texture variants when triggered.
# TRIVIA
This entity was introduced in Quake (1996).
*/
#ifdef SERVER
class
func_illusionary:NSRenderableEntity
{
public:
void func_illusionary(void);
#ifdef SERVER
virtual void Respawn(void);
virtual float SendEntity(entity,float);
virtual void Trigger(entity, triggermode_t);
#else
virtual void Init(void);
#endif
};
#ifdef SERVER
/* we're overriding SendEntity so that we don't network func_illusionarys
* without a targetname. They'll never experience gameplay changes
* and therefore can be handled fully client-side */
float
func_illusionary::SendEntity(entity pvsent, float fl)
void
func_illusionary::func_illusionary(void)
{
if ((GetRenderMode() != RM_NORMAL) || HasTargetname())
return super::SendEntity(pvsent, fl);
else
return (0);
}
void
@ -89,37 +77,4 @@ func_illusionary::Respawn(void)
SetSkin(0);
}
}
#else
void
func_illusionary::Init(void)
{
super::Init();
/* this entity is being controlled by the server, remove it */
if ((GetRenderMode() != RM_NORMAL) || (targetname)) {
Destroy();
return;
}
precache_model(model);
SetModel(model);
SetOrigin(origin);
SetAngles([0,0,0]);
SetMovetype(MOVETYPE_NONE);
SetSolid(SOLID_NOT);
if (skin == -1 && m_iRenderMode == RM_TEXTURE)
Hide();
MakeStatic();
}
#endif
void
func_illusionary::func_illusionary(void)
{
#ifdef CLIENT
isCSQC = true;
#endif
}

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

@ -28,34 +28,21 @@ On idTech 2 BSPs, it will change texture variants when triggered.
This entity was introduced in Quake (1996).
*/
#ifdef SERVER
class
func_wall:NSRenderableEntity
{
public:
void func_wall(void);
#ifdef SERVER
virtual void Respawn(void);
virtual float SendEntity(entity,float);
virtual void Trigger(entity, triggermode_t);
#else
virtual void Init(void);
virtual bool CanSpawn(bool);
#endif
};
#ifdef SERVER
/* we're overriding SendEntity so that we don't network func_walls
* without a targetname. They'll never experience gameplay changes
* and therefore can be handled fully client-side */
float
func_wall::SendEntity(entity pvsent, float fl)
void
func_wall::func_wall(void)
{
/* if we have a target name, act norm */
if ((GetRenderMode() != RM_NORMAL) || (targetname))
return super::SendEntity(pvsent, fl);
else
return (0);
}
void
@ -87,43 +74,7 @@ func_wall::Respawn(void)
SetFrame(0);
ClearAngles();
}
#else
bool
func_wall::CanSpawn(bool clientSide)
{
return true;
}
void
func_wall::Init(void)
{
super::Init();
/* this entity is being controlled by the server, remove it */
if ((GetRenderMode() != RM_NORMAL) && (targetname)) {
Destroy();
return;
}
precache_model(model);
SetModel(model);
SetOrigin(origin);
SetAngles([0,0,0]);
SetMovetype(MOVETYPE_NONE);
SetSolid(SOLID_BSP);
MakeStatic();
}
#endif
void
func_wall::func_wall(void)
{
#ifdef CLIENT
isCSQC = true;
#endif
}
/* temporary */
CLASSEXPORT(func_reflective_glass, func_wall)