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

Proper nonvirtual declarations for class methods.

Browse source
This commit is contained in:
Marco Cawthorne 2022-08-24 15:11:04 -07:00
parent a6da238e53
commit 146051dd67
Signed by: eukara
GPG key ID: CE2032F0A2882A22
18 changed files with 150 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/shared/NSClient.h
View file

@ -34,10 +34,10 @@ NSClient:NSNavAI
virtual void(void) PreFrame; virtual void(void) PreFrame;
virtual void(void) PostFrame; virtual void(void) PostFrame;
const bool(void) IsFakeSpectator; virtual bool(void) IsFakeSpectator;
const bool(void) IsRealSpectator; virtual bool(void) IsRealSpectator;
const bool(void) IsDead; virtual bool(void) IsDead;
const bool(void) IsPlayer; virtual bool(void) IsPlayer;
virtual void(void) OnRemoveEntity; virtual void(void) OnRemoveEntity;

8
src/shared/NSClient.qc
View file

@ -59,25 +59,25 @@ NSClient::PostFrame(void)
{ {
} }
const bool bool
NSClient::IsFakeSpectator(void) NSClient::IsFakeSpectator(void)
{ {
return (false); return (false);
} }
const bool bool
NSClient::IsRealSpectator(void) NSClient::IsRealSpectator(void)
{ {
return (false); return (false);
} }
const bool bool
NSClient::IsDead(void) NSClient::IsDead(void)
{ {
return (false); return (false);
} }
const bool bool
NSClient::IsPlayer(void) NSClient::IsPlayer(void)
{ {
return (false); return (false);

8
src/shared/NSClientPlayer.h
View file

@ -80,10 +80,10 @@ NSClientPlayer:NSClientSpectator
virtual void(void) Physics_InputPostMove; virtual void(void) Physics_InputPostMove;
virtual void(void) Physics_Run; virtual void(void) Physics_Run;
const bool(void) IsFakeSpectator; virtual bool(void) IsFakeSpectator;
const bool(void) IsRealSpectator; virtual bool(void) IsRealSpectator;
const bool(void) IsDead; virtual bool(void) IsDead;
const bool(void) IsPlayer; virtual bool(void) IsPlayer;
#ifdef CLIENT #ifdef CLIENT
int sequence; int sequence;

8
src/shared/NSClientPlayer.qc
View file

@ -21,13 +21,13 @@ NSClientPlayer::NSClientPlayer(void)
vehicle = __NULL__; vehicle = __NULL__;
} }
const bool bool
NSClientPlayer::IsRealSpectator(void) NSClientPlayer::IsRealSpectator(void)
{ {
return (false); return (false);
} }
const bool bool
NSClientPlayer::IsDead(void) NSClientPlayer::IsDead(void)
{ {
if (health > 0) if (health > 0)
@ -36,13 +36,13 @@ NSClientPlayer::IsDead(void)
return (true); return (true);
} }
const bool bool
NSClientPlayer::IsPlayer(void) NSClientPlayer::IsPlayer(void)
{ {
return (false); return (false);
} }
const bool bool
NSClientPlayer::IsFakeSpectator(void) NSClientPlayer::IsFakeSpectator(void)
{ {
if (GetFlags() & FL_FAKESPEC) if (GetFlags() & FL_FAKESPEC)

8
src/shared/NSClientSpectator.h
View file

@ -60,10 +60,10 @@ class NSClientSpectator:NSClient
virtual void(void) PostFrame; virtual void(void) PostFrame;
virtual void(void) SpectatorTrackPlayer; virtual void(void) SpectatorTrackPlayer;
const bool(void) IsFakeSpectator; virtual bool(void) IsFakeSpectator;
const bool(void) IsRealSpectator; virtual bool(void) IsRealSpectator;
const bool(void) IsDead; virtual bool(void) IsDead;
const bool(void) IsPlayer; virtual bool(void) IsPlayer;
#ifdef SERVER #ifdef SERVER
virtual void(float) Save; virtual void(float) Save;

8
src/shared/NSClientSpectator.qc
View file

@ -37,25 +37,25 @@ NSClientSpectator::Restore(string strKey, string strValue)
} }
#endif #endif
const bool bool
NSClientSpectator::IsRealSpectator(void) NSClientSpectator::IsRealSpectator(void)
{ {
return (true); return (true);
} }
const bool bool
NSClientSpectator::IsDead(void) NSClientSpectator::IsDead(void)
{ {
return (false); return (false);
} }
const bool bool
NSClientSpectator::IsPlayer(void) NSClientSpectator::IsPlayer(void)
{ {
return (false); return (false);
} }
const bool bool
NSClientSpectator::IsFakeSpectator(void) NSClientSpectator::IsFakeSpectator(void)
{ {
return (false); return (false);

76
src/shared/NSEntity.h
View file

@ -105,7 +105,7 @@ class NSEntity:NSTrigger
virtual void(void) EvaluateEntity; virtual void(void) EvaluateEntity;
virtual float(entity, float) SendEntity; virtual float(entity, float) SendEntity;
const entity(void) GetParent; nonvirtual entity(void) GetParent;
virtual void(string) SetParent; virtual void(string) SetParent;
virtual void(string) SetParentAttachment; virtual void(string) SetParentAttachment;
virtual void(void) ClearParent; virtual void(void) ClearParent;
@ -138,54 +138,54 @@ class NSEntity:NSTrigger
virtual void(float) RemoveFlags; virtual void(float) RemoveFlags;
/* gets */ /* gets */
const vector(void) GetSpawnOrigin; nonvirtual vector(void) GetSpawnOrigin;
const vector(void) GetSpawnAngles; nonvirtual vector(void) GetSpawnAngles;
const string(void) GetSpawnModel; nonvirtual string(void) GetSpawnModel;
const float(void) GetEffects; nonvirtual float(void) GetEffects;
const float(void) GetFrame; nonvirtual float(void) GetFrame;
const float(void) GetSkin; nonvirtual float(void) GetSkin;
const float(void) GetScale; nonvirtual float(void) GetScale;
const entity(void) GetOwner; nonvirtual entity(void) GetOwner;
const vector(void) GetVelocity; nonvirtual vector(void) GetVelocity;
const float(void) GetSolid; nonvirtual float(void) GetSolid;
const string(void) GetModel; nonvirtual string(void) GetModel;
const float(void) GetModelindex; nonvirtual float(void) GetModelindex;
const float(void) GetMovetype; nonvirtual float(void) GetMovetype;
const float(void) GetGravity; nonvirtual float(void) GetGravity;
const vector(void) GetAngles; nonvirtual vector(void) GetAngles;
const vector(void) GetAngularVelocity; nonvirtual vector(void) GetAngularVelocity;
const vector(void) GetOrigin; nonvirtual vector(void) GetOrigin;
const vector(void) GetMins; nonvirtual vector(void) GetMins;
const vector(void) GetMaxs; nonvirtual vector(void) GetMaxs;
const vector(void) GetRealMins; nonvirtual vector(void) GetRealMins;
const vector(void) GetRealMaxs; nonvirtual vector(void) GetRealMaxs;
const vector(void) GetAbsoluteMins; nonvirtual vector(void) GetAbsoluteMins;
const vector(void) GetAbsoluteMaxs; nonvirtual vector(void) GetAbsoluteMaxs;
const float(void) GetFlags; nonvirtual float(void) GetFlags;
virtual void(void) Show; virtual void(void) Show;
virtual void(void) Hide; virtual void(void) Hide;
const bool(void) IsHidden; nonvirtual bool(void) IsHidden;
virtual void(string, string) SpawnKey; virtual void(string, string) SpawnKey;
virtual void(void) Destroy; virtual void(void) Destroy;
virtual void(void) UpdateBounds; virtual void(void) UpdateBounds;
/* useful methods, based on GMod's API */ /* useful methods, based on GMod's API */
const float(void) EntIndex; nonvirtual float(void) EntIndex;
virtual void(void) DropToFloor; virtual void(void) DropToFloor;
const vector(void) GetForward; nonvirtual vector(void) GetForward;
const vector(void) GetRight; nonvirtual vector(void) GetRight;
const vector(void) GetUp; nonvirtual vector(void) GetUp;
const vector(void) WorldSpaceCenter; nonvirtual vector(void) WorldSpaceCenter;
const float(void) WaterLevel; nonvirtual float(void) WaterLevel;
const bool(entity) Visible; nonvirtual bool(entity) Visible;
const bool(vector) VisibleVec; nonvirtual bool(vector) VisibleVec;
const bool(float) HasSpawnFlags; nonvirtual bool(float) HasSpawnFlags;
const bool(void) IsOnGround; nonvirtual bool(void) IsOnGround;
const entity(void) GetGroundEntity; nonvirtual entity(void) GetGroundEntity;
const bool(void) CreatedByMap; nonvirtual bool(void) CreatedByMap;
virtual void(entity) Blocked; virtual void(entity) Blocked;
virtual void(entity) StartTouch; virtual void(entity) StartTouch;

78
src/shared/NSEntity.qc
View file

@ -55,7 +55,7 @@ NSEntity::Spawned(void)
#endif #endif
} }
const float float
NSEntity::EntIndex(void) NSEntity::EntIndex(void)
{ {
return num_for_edict(this); return num_for_edict(this);
@ -76,21 +76,21 @@ NSEntity::DropToFloor(void)
droptofloorwrapper(this); droptofloorwrapper(this);
} }
const vector vector
NSEntity::GetForward(void) NSEntity::GetForward(void)
{ {
makevectors(angles); makevectors(angles);
return v_forward; return v_forward;
} }
const vector vector
NSEntity::GetRight(void) NSEntity::GetRight(void)
{ {
makevectors(angles); makevectors(angles);
return v_right; return v_right;
} }
const vector vector
NSEntity::GetUp(void) NSEntity::GetUp(void)
{ {
makevectors(angles); makevectors(angles);
@ -105,7 +105,7 @@ Returns the center of an entity's bounding boxes.
Useful on brush entities that have no real 'origin' defined. Useful on brush entities that have no real 'origin' defined.
============ ============
*/ */
const vector vector
NSEntity::WorldSpaceCenter(void) NSEntity::WorldSpaceCenter(void)
{ {
return absmin + (0.5 * (absmax - absmin)); return absmin + (0.5 * (absmax - absmin));
@ -118,7 +118,7 @@ NSEntity::VisibleVec
Returns whether or not the entity is able to see a given position Returns whether or not the entity is able to see a given position
============ ============
*/ */
const float float
NSEntity::WaterLevel(void) NSEntity::WaterLevel(void)
{ {
return waterlevel; return waterlevel;
@ -131,7 +131,7 @@ NSEntity::VisibleVec
Returns whether or not the entity is able to see a given position Returns whether or not the entity is able to see a given position
============ ============
*/ */
const bool bool
NSEntity::VisibleVec(vector org) NSEntity::VisibleVec(vector org)
{ {
vector flDelta; vector flDelta;
@ -157,7 +157,7 @@ NSEntity::Visible
Returns whether or not the entity is able to see a given entity Returns whether or not the entity is able to see a given entity
============ ============
*/ */
const bool bool
NSEntity::Visible(entity ent) NSEntity::Visible(entity ent)
{ {
vector flDelta; vector flDelta;
@ -179,31 +179,31 @@ NSEntity::Visible(entity ent)
return (false); return (false);
} }
const bool bool
NSEntity::HasSpawnFlags(float sf) NSEntity::HasSpawnFlags(float sf)
{ {
return (spawnflags & sf) ? true : false; return (spawnflags & sf) ? true : false;
} }
const bool bool
NSEntity::IsOnGround(void) NSEntity::IsOnGround(void)
{ {
return (flags & FL_ONGROUND) ? true : false; return (flags & FL_ONGROUND) ? true : false;
} }
const bool bool
NSEntity::IsSolid(void) NSEntity::IsSolid(void)
{ {
return (solid != SOLID_NOT) ? true : false; return (solid != SOLID_NOT) ? true : false;
} }
const entity entity
NSEntity::GetGroundEntity(void) NSEntity::GetGroundEntity(void)
{ {
return groundentity; return groundentity;
} }
const bool bool
NSEntity::CreatedByMap(void) NSEntity::CreatedByMap(void)
{ {
return _mapspawned; return _mapspawned;
@ -451,7 +451,7 @@ NSEntity::ParentUpdate(void)
} }
} }
const entity entity
NSEntity::GetParent(void) NSEntity::GetParent(void)
{ {
return find(world, ::targetname, m_parent); return find(world, ::targetname, m_parent);
@ -677,145 +677,145 @@ NSEntity::RemoveFlags(float fl)
flags &= ~fl; flags &= ~fl;
} }
const vector vector
NSEntity::GetSpawnOrigin(void) NSEntity::GetSpawnOrigin(void)
{ {
return m_oldOrigin; return m_oldOrigin;
} }
const vector vector
NSEntity::GetSpawnAngles(void) NSEntity::GetSpawnAngles(void)
{ {
return m_oldAngle; return m_oldAngle;
} }
const string string
NSEntity::GetSpawnModel(void) NSEntity::GetSpawnModel(void)
{ {
return m_oldModel; return m_oldModel;
} }
const float float
NSEntity::GetEffects(void) NSEntity::GetEffects(void)
{ {
return effects; return effects;
} }
const float float
NSEntity::GetFrame(void) NSEntity::GetFrame(void)
{ {
return frame; return frame;
} }
const float float
NSEntity::GetSkin(void) NSEntity::GetSkin(void)
{ {
return skin; return skin;
} }
const float float
NSEntity::GetScale(void) NSEntity::GetScale(void)
{ {
return scale; return scale;
} }
const entity entity
NSEntity::GetOwner(void) NSEntity::GetOwner(void)
{ {
return owner; return owner;
} }
const vector vector
NSEntity::GetVelocity(void) NSEntity::GetVelocity(void)
{ {
return velocity; return velocity;
} }
const float float
NSEntity::GetSolid(void) NSEntity::GetSolid(void)
{ {
return solid; return solid;
} }
const string string
NSEntity::GetModel(void) NSEntity::GetModel(void)
{ {
return model; return model;
} }
const float float
NSEntity::GetModelindex(void) NSEntity::GetModelindex(void)
{ {
return modelindex; return modelindex;
} }
const float float
NSEntity::GetMovetype(void) NSEntity::GetMovetype(void)
{ {
return movetype; return movetype;
} }
const float float
NSEntity::GetGravity(void) NSEntity::GetGravity(void)
{ {
return gravity; return gravity;
} }
const vector vector
NSEntity::GetAngles(void) NSEntity::GetAngles(void)
{ {
return angles; return angles;
} }
const vector vector
NSEntity::GetAngularVelocity(void) NSEntity::GetAngularVelocity(void)
{ {
return avelocity; return avelocity;
} }
const vector vector
NSEntity::GetOrigin(void) NSEntity::GetOrigin(void)
{ {
return origin; return origin;
} }
const vector vector
NSEntity::GetMins(void) NSEntity::GetMins(void)
{ {
return mins; return mins;
} }
const vector vector
NSEntity::GetMaxs(void) NSEntity::GetMaxs(void)
{ {
return maxs; return maxs;
} }
const vector vector
NSEntity::GetRealMins(void) NSEntity::GetRealMins(void)
{ {
return m_vecMins; return m_vecMins;
} }
const vector vector
NSEntity::GetRealMaxs(void) NSEntity::GetRealMaxs(void)
{ {
return m_vecMaxs; return m_vecMaxs;
} }
const vector vector
NSEntity::GetAbsoluteMins(void) NSEntity::GetAbsoluteMins(void)
{ {
return absmin; return absmin;
} }
const vector vector
NSEntity::GetAbsoluteMaxs(void) NSEntity::GetAbsoluteMaxs(void)
{ {
return absmax; return absmax;
} }
const float float
NSEntity::GetFlags(void) NSEntity::GetFlags(void)
{ {
return flags; return flags;
@ -1047,7 +1047,7 @@ NSEntity::Hide(void)
effects |= EF_NODRAW; effects |= EF_NODRAW;
} }
const bool bool
NSEntity::IsHidden(void) NSEntity::IsHidden(void)
{ {
return (effects & EF_NODRAW) ? true : false; return (effects & EF_NODRAW) ? true : false;

14
src/shared/NSMonster.h
View file

@ -253,7 +253,7 @@ class NSMonster:NSNavAI
virtual void(string) Sound; virtual void(string) Sound;
virtual void(string, string) SpawnKey; virtual void(string, string) SpawnKey;
const bool(void) IsAlive; virtual bool(void) IsAlive;
virtual bool(int) IsFriend; virtual bool(int) IsFriend;
/* see/hear subsystem */ /* see/hear subsystem */
@ -279,15 +279,15 @@ class NSMonster:NSNavAI
virtual float(void) MeleeMaxDistance; virtual float(void) MeleeMaxDistance;
virtual bool(void) MeleeCondition; virtual bool(void) MeleeCondition;
const bool(entity enemy) IsValidEnemy; nonvirtual bool(entity enemy) IsValidEnemy;
/* sequences */ /* sequences */
virtual void(void) FreeState; virtual void(void) FreeState;
virtual void(void) FreeStateMoved; virtual void(void) FreeStateMoved;
virtual void(void) RouteEnded; virtual void(void) RouteEnded;
virtual void(void) WalkRoute; virtual void(void) WalkRoute;
const int(void) GetSequenceState; nonvirtual int(void) GetSequenceState;
const bool(void) InSequence; nonvirtual bool(void) InSequence;
/* animation cycles */ /* animation cycles */
float m_flAnimTime; float m_flAnimTime;
@ -296,15 +296,15 @@ class NSMonster:NSNavAI
virtual int(void) AnimRun; virtual int(void) AnimRun;
virtual void(float) AnimPlay; virtual void(float) AnimPlay;
virtual void(void) AnimationUpdate; virtual void(void) AnimationUpdate;
const bool(void) InAnimation; nonvirtual bool(void) InAnimation;
/* states */ /* states */
virtual void(monsterState_t, monsterState_t) StateChanged; virtual void(monsterState_t, monsterState_t) StateChanged;
virtual void(monsterState_t) SetState; virtual void(monsterState_t) SetState;
const monsterState_t(void) GetState; nonvirtual monsterState_t(void) GetState;
/* TriggerTarget/Condition */ /* TriggerTarget/Condition */
const int(void) GetTriggerCondition; nonvirtual int(void) GetTriggerCondition;
virtual void(void) TriggerTargets; virtual void(void) TriggerTargets;
virtual float(entity, float) SendEntity; virtual float(entity, float) SendEntity;

14
src/shared/NSMonster.qc
View file

@ -27,7 +27,7 @@ NSMonster::NSMonster(void)
} }
#ifdef SERVER #ifdef SERVER
const int int
NSMonster::GetTriggerCondition(void) NSMonster::GetTriggerCondition(void)
{ {
return m_iTriggerCondition; return m_iTriggerCondition;
@ -185,7 +185,7 @@ NSMonster::AnimPlay(float seq)
m_flAnimTime = time + frameduration(modelindex, frame); m_flAnimTime = time + frameduration(modelindex, frame);
} }
const bool bool
NSMonster::InAnimation(void) NSMonster::InAnimation(void)
{ {
return (m_flAnimTime > time) ? true : false; return (m_flAnimTime > time) ? true : false;
@ -272,7 +272,7 @@ NSMonster::AlertNearby(void)
} }
/* returns TRUE if 'enemy' should be considered a valid target for killing */ /* returns TRUE if 'enemy' should be considered a valid target for killing */
const bool bool
NSMonster::IsValidEnemy(entity enemy) NSMonster::IsValidEnemy(entity enemy)
{ {
if (enemy == __NULL__) if (enemy == __NULL__)
@ -618,7 +618,7 @@ NSMonster::AnimationUpdate(void)
} }
/* for an NSMonster, health doesn't matter that much, as we could be a corpse */ /* for an NSMonster, health doesn't matter that much, as we could be a corpse */
const bool bool
NSMonster::IsAlive(void) NSMonster::IsAlive(void)
{ {
if (GetState() == MONSTER_DEAD) if (GetState() == MONSTER_DEAD)
@ -645,19 +645,19 @@ NSMonster::SetState(monsterState_t newState)
StateChanged(m_iOldMState, m_iMState); StateChanged(m_iOldMState, m_iMState);
} }
const monsterState_t monsterState_t
NSMonster::GetState(void) NSMonster::GetState(void)
{ {
return m_iMState; return m_iMState;
} }
const int int
NSMonster::GetSequenceState(void) NSMonster::GetSequenceState(void)
{ {
return m_iSequenceState; return m_iSequenceState;
} }
const bool bool
NSMonster::InSequence(void) NSMonster::InSequence(void)
{ {
return (GetSequenceState() == SEQUENCESTATE_NONE) ? false : true; return (GetSequenceState() == SEQUENCESTATE_NONE) ? false : true;

4
src/shared/NSNavAI.h
View file

@ -39,8 +39,8 @@ NSNavAI:NSSurfacePropEntity
/* methods we'd like others to override */ /* methods we'd like others to override */
virtual bool(void) CanCrouch; virtual bool(void) CanCrouch;
const vector(void) GetRouteMovevalues; nonvirtual vector(void) GetRouteMovevalues;
const vector(void) GetRouteDirection; nonvirtual vector(void) GetRouteDirection;
virtual void(void) RouteEnded; virtual void(void) RouteEnded;
virtual void(void) RouteClear; virtual void(void) RouteClear;

4
src/shared/NSNavAI.qc
View file

@ -186,7 +186,7 @@ NSNavAI::CheckRoute(void)
}*/ }*/
} }
const vector vector
NSNavAI::GetRouteMovevalues(void) NSNavAI::GetRouteMovevalues(void)
{ {
vector vecDirection; vector vecDirection;
@ -203,7 +203,7 @@ NSNavAI::GetRouteMovevalues(void)
return [v_forward * vecDirection, v_right * vecDirection, v_up * vecDirection]; return [v_forward * vecDirection, v_right * vecDirection, v_up * vecDirection];
} }
const vector vector
NSNavAI::GetRouteDirection(void) NSNavAI::GetRouteDirection(void)
{ {
if (!m_iNodes) if (!m_iNodes)

10
src/shared/NSPhysicsEntity.h
View file

@ -82,19 +82,19 @@ class NSPhysicsEntity:NSSurfacePropEntity
virtual void(string, string) SpawnKey; virtual void(string, string) SpawnKey;
virtual void(float) SetMass; virtual void(float) SetMass;
virtual float(void) GetMass; nonvirtual float(void) GetMass;
virtual void(float) SetFriction; virtual void(float) SetFriction;
virtual float(void) GetFriction; nonvirtual float(void) GetFriction;
virtual void(float) SetBounceFactor; virtual void(float) SetBounceFactor;
virtual float(void) GetBounceFactor; nonvirtual float(void) GetBounceFactor;
virtual void(float) SetBounceStop; virtual void(float) SetBounceStop;
virtual float(void) GetBounceStop; nonvirtual float(void) GetBounceStop;
virtual void(void) PhysicsEnable; virtual void(void) PhysicsEnable;
virtual void(void) PhysicsDisable; virtual void(void) PhysicsDisable;
virtual void(vector) ApplyForceCenter; virtual void(vector) ApplyForceCenter;
virtual void(vector, vector) ApplyForceOffset; virtual void(vector, vector) ApplyForceOffset;
virtual void(vector) ApplyTorqueCenter; virtual void(vector) ApplyTorqueCenter;
virtual float(int, int) CalculateImpactDamage; nonvirtual float(int, int) CalculateImpactDamage;
}; };
#ifdef CLIENT #ifdef CLIENT

20
src/shared/NSRenderableEntity.h
View file

@ -136,16 +136,16 @@ class NSRenderableEntity:NSEntity
virtual void(float) SetBoneControl4; virtual void(float) SetBoneControl4;
virtual void(float) SetBoneControl5; virtual void(float) SetBoneControl5;
const int(void) GetBody; nonvirtual int(void) GetBody;
const float(void) GetRenderMode; nonvirtual float(void) GetRenderMode;
const float(void) GetRenderFX; nonvirtual float(void) GetRenderFX;
const float(void) GetRenderAmt; nonvirtual float(void) GetRenderAmt;
const vector(void) GetRenderColor; nonvirtual vector(void) GetRenderColor;
const float(void) GetBoneControl1; nonvirtual float(void) GetBoneControl1;
const float(void) GetBoneControl2; nonvirtual float(void) GetBoneControl2;
const float(void) GetBoneControl3; nonvirtual float(void) GetBoneControl3;
const float(void) GetBoneControl4; nonvirtual float(void) GetBoneControl4;
const float(void) GetBoneControl5; nonvirtual float(void) GetBoneControl5;
#ifdef CLIENT #ifdef CLIENT
virtual void(void) RenderFXPass; virtual void(void) RenderFXPass;

20
src/shared/NSRenderableEntity.qc
View file

@ -600,61 +600,61 @@ NSRenderableEntity::SetBoneControl5(float val)
m_flBoneControl5 = val; m_flBoneControl5 = val;
} }
const int int
NSRenderableEntity::GetBody(void) NSRenderableEntity::GetBody(void)
{ {
return m_iBody; return m_iBody;
} }
const float float
NSRenderableEntity::GetRenderMode(void) NSRenderableEntity::GetRenderMode(void)
{ {
return m_iRenderMode; return m_iRenderMode;
} }
const float float
NSRenderableEntity::GetRenderFX(void) NSRenderableEntity::GetRenderFX(void)
{ {
return m_iRenderFX; return m_iRenderFX;
} }
const float float
NSRenderableEntity::GetRenderAmt(void) NSRenderableEntity::GetRenderAmt(void)
{ {
return m_flRenderAmt; return m_flRenderAmt;
} }
const vector vector
NSRenderableEntity::GetRenderColor(void) NSRenderableEntity::GetRenderColor(void)
{ {
return m_vecRenderColor; return m_vecRenderColor;
} }
const float float
NSRenderableEntity::GetBoneControl1(void) NSRenderableEntity::GetBoneControl1(void)
{ {
return m_flBoneControl1; return m_flBoneControl1;
} }
const float float
NSRenderableEntity::GetBoneControl2(void) NSRenderableEntity::GetBoneControl2(void)
{ {
return m_flBoneControl2; return m_flBoneControl2;
} }
const float float
NSRenderableEntity::GetBoneControl3(void) NSRenderableEntity::GetBoneControl3(void)
{ {
return m_flBoneControl3; return m_flBoneControl3;
} }
const float float
NSRenderableEntity::GetBoneControl4(void) NSRenderableEntity::GetBoneControl4(void)
{ {
return m_flBoneControl4; return m_flBoneControl4;
} }
const float float
NSRenderableEntity::GetBoneControl5(void) NSRenderableEntity::GetBoneControl5(void)
{ {
return m_flBoneControl5; return m_flBoneControl5;

2
src/shared/NSSurfacePropEntity.qc
View file

@ -86,7 +86,7 @@ typedef struct
nettype_e type; nettype_e type;
} netinfo_t; } netinfo_t;
const netinfo_t n_NSSurfacePropEntity[] = netinfo_t n_NSSurfacePropEntity[] =
{ {
{origin[0], NSEntity::origin_net[0], SRFENT_CHANGED_ORIGIN_X, 0, NETFIELD_COORD}, {origin[0], NSEntity::origin_net[0], SRFENT_CHANGED_ORIGIN_X, 0, NETFIELD_COORD},
{origin[1], NSEntity::origin_net[1], SRFENT_CHANGED_ORIGIN_Y, 0, NETFIELD_COORD}, {origin[1], NSEntity::origin_net[1], SRFENT_CHANGED_ORIGIN_Y, 0, NETFIELD_COORD},

6
src/shared/NSTrigger.h
View file

@ -52,9 +52,9 @@ class NSTrigger:NSIO
virtual void(entity, int, float) UseTargets; virtual void(entity, int, float) UseTargets;
/* master feature */ /* master feature */
virtual int(void) GetValue; nonvirtual int(void) GetValue;
virtual int(void) GetMaster; nonvirtual int(void) GetMaster;
virtual globalstate_t(string) GetGlobalValue; nonvirtual globalstate_t(string) GetGlobalValue;
/* overrides */ /* overrides */
virtual void(float) Save; virtual void(float) Save;

4
src/shared/NSVehicle.h
View file

@ -47,14 +47,14 @@ class NSVehicle:NSSurfacePropEntity
virtual bool(void) HideCrosshair; virtual bool(void) HideCrosshair;
virtual bool(void) HidePlayermodel; virtual bool(void) HidePlayermodel;
#else #else
virtual vector(void) GetExitPos; nonvirtual vector(void) GetExitPos;
virtual void(void) EvaluateEntity; virtual void(void) EvaluateEntity;
virtual float(entity, float) SendEntity; virtual float(entity, float) SendEntity;
virtual void(float) Save; virtual void(float) Save;
virtual void(string,string) Restore; virtual void(string,string) Restore;
#endif #endif
virtual entity(void) GetDriver; nonvirtual entity(void) GetDriver;
virtual void(void) PlayerUpdateFlags; virtual void(void) PlayerUpdateFlags;
virtual void(void) PlayerAlign; virtual void(void) PlayerAlign;
virtual void(NSClientPlayer) PlayerEnter; virtual void(NSClientPlayer) PlayerEnter;