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) PostFrame;
const bool(void) IsFakeSpectator;
const bool(void) IsRealSpectator;
const bool(void) IsDead;
const bool(void) IsPlayer;
virtual bool(void) IsFakeSpectator;
virtual bool(void) IsRealSpectator;
virtual bool(void) IsDead;
virtual bool(void) IsPlayer;
virtual void(void) OnRemoveEntity;

8
src/shared/NSClient.qc
View file

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

8
src/shared/NSClientPlayer.h
View file

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

8
src/shared/NSClientPlayer.qc
View file

@ -21,13 +21,13 @@ NSClientPlayer::NSClientPlayer(void)
vehicle = __NULL__;
}
const bool
bool
NSClientPlayer::IsRealSpectator(void)
{
return (false);
}
const bool
bool
NSClientPlayer::IsDead(void)
{
if (health > 0)
@ -36,13 +36,13 @@ NSClientPlayer::IsDead(void)
return (true);
}
const bool
bool
NSClientPlayer::IsPlayer(void)
{
return (false);
}
const bool
bool
NSClientPlayer::IsFakeSpectator(void)
{
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) SpectatorTrackPlayer;
const bool(void) IsFakeSpectator;
const bool(void) IsRealSpectator;
const bool(void) IsDead;
const bool(void) IsPlayer;
virtual bool(void) IsFakeSpectator;
virtual bool(void) IsRealSpectator;
virtual bool(void) IsDead;
virtual bool(void) IsPlayer;
#ifdef SERVER
virtual void(float) Save;

8
src/shared/NSClientSpectator.qc
View file

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

76
src/shared/NSEntity.h
View file

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

78
src/shared/NSEntity.qc
View file

@ -55,7 +55,7 @@ NSEntity::Spawned(void)
#endif
}
const float
float
NSEntity::EntIndex(void)
{
return num_for_edict(this);
@ -76,21 +76,21 @@ NSEntity::DropToFloor(void)
droptofloorwrapper(this);
}
const vector
vector
NSEntity::GetForward(void)
{
makevectors(angles);
return v_forward;
}
const vector
vector
NSEntity::GetRight(void)
{
makevectors(angles);
return v_right;
}
const vector
vector
NSEntity::GetUp(void)
{
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.
============
*/
const vector
vector
NSEntity::WorldSpaceCenter(void)
{
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
============
*/
const float
float
NSEntity::WaterLevel(void)
{
return waterlevel;
@ -131,7 +131,7 @@ NSEntity::VisibleVec
Returns whether or not the entity is able to see a given position
============
*/
const bool
bool
NSEntity::VisibleVec(vector org)
{
vector flDelta;
@ -157,7 +157,7 @@ NSEntity::Visible
Returns whether or not the entity is able to see a given entity
============
*/
const bool
bool
NSEntity::Visible(entity ent)
{
vector flDelta;
@ -179,31 +179,31 @@ NSEntity::Visible(entity ent)
return (false);
}
const bool
bool
NSEntity::HasSpawnFlags(float sf)
{
return (spawnflags & sf) ? true : false;
}
const bool
bool
NSEntity::IsOnGround(void)
{
return (flags & FL_ONGROUND) ? true : false;
}
const bool
bool
NSEntity::IsSolid(void)
{
return (solid != SOLID_NOT) ? true : false;
}
const entity
entity
NSEntity::GetGroundEntity(void)
{
return groundentity;
}
const bool
bool
NSEntity::CreatedByMap(void)
{
return _mapspawned;
@ -451,7 +451,7 @@ NSEntity::ParentUpdate(void)
}
}
const entity
entity
NSEntity::GetParent(void)
{
return find(world, ::targetname, m_parent);
@ -677,145 +677,145 @@ NSEntity::RemoveFlags(float fl)
flags &= ~fl;
}
const vector
vector
NSEntity::GetSpawnOrigin(void)
{
return m_oldOrigin;
}
const vector
vector
NSEntity::GetSpawnAngles(void)
{
return m_oldAngle;
}
const string
string
NSEntity::GetSpawnModel(void)
{
return m_oldModel;
}
const float
float
NSEntity::GetEffects(void)
{
return effects;
}
const float
float
NSEntity::GetFrame(void)
{
return frame;
}
const float
float
NSEntity::GetSkin(void)
{
return skin;
}
const float
float
NSEntity::GetScale(void)
{
return scale;
}
const entity
entity
NSEntity::GetOwner(void)
{
return owner;
}
const vector
vector
NSEntity::GetVelocity(void)
{
return velocity;
}
const float
float
NSEntity::GetSolid(void)
{
return solid;
}
const string
string
NSEntity::GetModel(void)
{
return model;
}
const float
float
NSEntity::GetModelindex(void)
{
return modelindex;
}
const float
float
NSEntity::GetMovetype(void)
{
return movetype;
}
const float
float
NSEntity::GetGravity(void)
{
return gravity;
}
const vector
vector
NSEntity::GetAngles(void)
{
return angles;
}
const vector
vector
NSEntity::GetAngularVelocity(void)
{
return avelocity;
}
const vector
vector
NSEntity::GetOrigin(void)
{
return origin;
}
const vector
vector
NSEntity::GetMins(void)
{
return mins;
}
const vector
vector
NSEntity::GetMaxs(void)
{
return maxs;
}
const vector
vector
NSEntity::GetRealMins(void)
{
return m_vecMins;
}
const vector
vector
NSEntity::GetRealMaxs(void)
{
return m_vecMaxs;
}
const vector
vector
NSEntity::GetAbsoluteMins(void)
{
return absmin;
}
const vector
vector
NSEntity::GetAbsoluteMaxs(void)
{
return absmax;
}
const float
float
NSEntity::GetFlags(void)
{
return flags;
@ -1047,7 +1047,7 @@ NSEntity::Hide(void)
effects |= EF_NODRAW;
}
const bool
bool
NSEntity::IsHidden(void)
{
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, string) SpawnKey;
const bool(void) IsAlive;
virtual bool(void) IsAlive;
virtual bool(int) IsFriend;
/* see/hear subsystem */
@ -279,15 +279,15 @@ class NSMonster:NSNavAI
virtual float(void) MeleeMaxDistance;
virtual bool(void) MeleeCondition;
const bool(entity enemy) IsValidEnemy;
nonvirtual bool(entity enemy) IsValidEnemy;
/* sequences */
virtual void(void) FreeState;
virtual void(void) FreeStateMoved;
virtual void(void) RouteEnded;
virtual void(void) WalkRoute;
const int(void) GetSequenceState;
const bool(void) InSequence;
nonvirtual int(void) GetSequenceState;
nonvirtual bool(void) InSequence;
/* animation cycles */
float m_flAnimTime;
@ -296,15 +296,15 @@ class NSMonster:NSNavAI
virtual int(void) AnimRun;
virtual void(float) AnimPlay;
virtual void(void) AnimationUpdate;
const bool(void) InAnimation;
nonvirtual bool(void) InAnimation;
/* states */
virtual void(monsterState_t, monsterState_t) StateChanged;
virtual void(monsterState_t) SetState;
const monsterState_t(void) GetState;
nonvirtual monsterState_t(void) GetState;
/* TriggerTarget/Condition */
const int(void) GetTriggerCondition;
nonvirtual int(void) GetTriggerCondition;
virtual void(void) TriggerTargets;
virtual float(entity, float) SendEntity;

14
src/shared/NSMonster.qc
View file

@ -27,7 +27,7 @@ NSMonster::NSMonster(void)
}
#ifdef SERVER
const int
int
NSMonster::GetTriggerCondition(void)
{
return m_iTriggerCondition;
@ -185,7 +185,7 @@ NSMonster::AnimPlay(float seq)
m_flAnimTime = time + frameduration(modelindex, frame);
}
const bool
bool
NSMonster::InAnimation(void)
{
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 */
const bool
bool
NSMonster::IsValidEnemy(entity enemy)
{
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 */
const bool
bool
NSMonster::IsAlive(void)
{
if (GetState() == MONSTER_DEAD)
@ -645,19 +645,19 @@ NSMonster::SetState(monsterState_t newState)
StateChanged(m_iOldMState, m_iMState);
}
const monsterState_t
monsterState_t
NSMonster::GetState(void)
{
return m_iMState;
}
const int
int
NSMonster::GetSequenceState(void)
{
return m_iSequenceState;
}
const bool
bool
NSMonster::InSequence(void)
{
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 */
virtual bool(void) CanCrouch;
const vector(void) GetRouteMovevalues;
const vector(void) GetRouteDirection;
nonvirtual vector(void) GetRouteMovevalues;
nonvirtual vector(void) GetRouteDirection;
virtual void(void) RouteEnded;
virtual void(void) RouteClear;

4
src/shared/NSNavAI.qc
View file

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

10
src/shared/NSPhysicsEntity.h
View file

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

20
src/shared/NSRenderableEntity.h
View file

@ -136,16 +136,16 @@ class NSRenderableEntity:NSEntity
virtual void(float) SetBoneControl4;
virtual void(float) SetBoneControl5;
const int(void) GetBody;
const float(void) GetRenderMode;
const float(void) GetRenderFX;
const float(void) GetRenderAmt;
const vector(void) GetRenderColor;
const float(void) GetBoneControl1;
const float(void) GetBoneControl2;
const float(void) GetBoneControl3;
const float(void) GetBoneControl4;
const float(void) GetBoneControl5;
nonvirtual int(void) GetBody;
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
virtual void(void) RenderFXPass;

20
src/shared/NSRenderableEntity.qc
View file

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

2
src/shared/NSSurfacePropEntity.qc
View file

@ -86,7 +86,7 @@ typedef struct
nettype_e type;
} 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[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;
/* master feature */
virtual int(void) GetValue;
virtual int(void) GetMaster;
virtual globalstate_t(string) GetGlobalValue;
nonvirtual int(void) GetValue;
nonvirtual int(void) GetMaster;
nonvirtual globalstate_t(string) GetGlobalValue;
/* overrides */
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) HidePlayermodel;
#else
virtual vector(void) GetExitPos;
nonvirtual vector(void) GetExitPos;
virtual void(void) EvaluateEntity;
virtual float(entity, float) SendEntity;
virtual void(float) Save;
virtual void(string,string) Restore;
#endif
virtual entity(void) GetDriver;
nonvirtual entity(void) GetDriver;
virtual void(void) PlayerUpdateFlags;
virtual void(void) PlayerAlign;
virtual void(NSClientPlayer) PlayerEnter;