From 6f2115c45f8e2ab70bca438b5cf8ed729934dda2 Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Tue, 3 Oct 2023 10:54:49 -0700 Subject: [PATCH] GS-EntBase: Fix formatting in a few class definitions --- src/gs-entbase/server/env_explosion.qc | 8 ++-- src/gs-entbase/server/env_fade.qc | 7 +-- src/gs-entbase/server/env_global.qc | 8 ++-- src/gs-entbase/server/env_hudhint.qc | 4 +- src/gs-entbase/server/env_message.qc | 8 ++-- src/gs-entbase/server/env_shake.qc | 10 ++--- src/gs-entbase/server/env_spark.qc | 4 +- src/gs-entbase/server/func_areaportal.qc | 11 ++--- src/gs-entbase/server/func_breakable.qc | 21 ++++----- src/gs-entbase/server/func_brush.qc | 6 +-- src/gs-entbase/server/func_button.qc | 35 ++++++++------- src/gs-entbase/server/func_guntarget.qc | 8 ++-- src/gs-entbase/server/func_healthcharger.qc | 16 +++---- src/gs-entbase/server/func_mortar_field.qc | 13 +++--- src/gs-entbase/server/func_pendulum.qc | 10 ++--- src/gs-entbase/server/func_platrot.qc | 15 ++++--- src/gs-entbase/server/func_recharge.qc | 17 +++---- src/gs-entbase/server/func_rot_button.qc | 13 +++--- src/gs-entbase/server/func_rotating.qc | 10 ++--- src/gs-entbase/server/func_tank.qc | 29 ++++++------ src/gs-entbase/server/func_wall_toggle.qc | 6 +-- src/gs-entbase/server/game_counter.qc | 8 ++-- src/gs-entbase/server/game_counter_set.qc | 4 +- src/gs-entbase/server/game_player_equip.qc | 4 +- src/gs-entbase/server/game_text.qc | 20 ++++----- src/gs-entbase/server/info_hint.qc | 18 ++++---- src/gs-entbase/server/infodecal.qc | 6 +-- src/gs-entbase/server/item_food.qc | 8 ++-- src/gs-entbase/server/item_generic.qc | 1 + src/gs-entbase/server/light.qc | 14 +++--- src/gs-entbase/server/logic_auto.qc | 24 +++++----- src/gs-entbase/server/logic_case.qc | 4 +- src/gs-entbase/server/momentary_rot_button.qc | 4 +- src/gs-entbase/server/momentarybase.qc | 27 ++++++------ src/gs-entbase/server/monstermaker.qc | 14 +++--- src/gs-entbase/server/multi_manager.qc | 8 ++-- src/gs-entbase/server/player_loadsaved.qc | 10 ++--- src/gs-entbase/server/point_camera.qc | 15 ++++--- src/gs-entbase/server/prop_door_rotating.qc | 11 ++--- src/gs-entbase/server/random_speaker.qc | 10 ++--- src/gs-entbase/server/random_trigger.qc | 10 ++--- src/gs-entbase/server/scripted_sentence.qc | 14 +++--- src/gs-entbase/server/speaker.qc | 6 +-- src/gs-entbase/server/targ_speaker.qc | 6 +-- src/gs-entbase/server/target_cdaudio.qc | 6 +-- src/gs-entbase/server/trigger_auto.qc | 6 +-- src/gs-entbase/server/trigger_autosave.qc | 5 ++- src/gs-entbase/server/trigger_cdaudio.qc | 4 +- src/gs-entbase/server/trigger_changelevel.qc | 15 ++++--- src/gs-entbase/server/trigger_counter.qc | 8 ++-- src/gs-entbase/server/trigger_relay.qc | 8 ++-- src/gs-entbase/shared/env_bubbles.qc | 21 ++++----- src/gs-entbase/shared/env_fire.qc | 14 +++--- src/gs-entbase/shared/env_fog_controller.qc | 44 +++++++++---------- src/gs-entbase/shared/env_projectedtexture.qc | 28 ++++++------ src/gs-entbase/shared/env_sprite.qc | 25 +++++------ src/gs-entbase/shared/func_conveyor.qc | 8 ++-- src/gs-entbase/shared/func_friction.qc | 6 +-- src/gs-entbase/shared/func_monitor.qc | 25 ++++++----- src/gs-entbase/shared/func_tankmortar.qc | 36 +++++++-------- src/gs-entbase/shared/func_vehicle.qc | 1 + src/gs-entbase/shared/info_particle_system.qc | 18 ++++---- src/gs-entbase/shared/light_dynamic.qc | 25 ++++++----- src/gs-entbase/shared/point_spotlight.qc | 12 ++--- .../shared/prop_physics_multiplayer.qc | 5 ++- .../shared/prop_vehicle_driveable.qc | 20 ++++----- src/gs-entbase/shared/trigger_gravity.qc | 5 ++- 67 files changed, 434 insertions(+), 416 deletions(-) diff --git a/src/gs-entbase/server/env_explosion.qc b/src/gs-entbase/server/env_explosion.qc index 1b84d208..9bb43e74 100644 --- a/src/gs-entbase/server/env_explosion.qc +++ b/src/gs-entbase/server/env_explosion.qc @@ -48,10 +48,6 @@ This entity was introduced in Half-Life (1998). class env_explosion:NSPointTrigger { - int m_iMagnitude; - float m_flMaxDelay; - bool m_bEnabled; - public: void env_explosion(void); @@ -62,6 +58,10 @@ public: virtual void SpawnKey(string,string); virtual void Respawn(void); +private: + int m_iMagnitude; + float m_flMaxDelay; + bool m_bEnabled; }; void diff --git a/src/gs-entbase/server/env_fade.qc b/src/gs-entbase/server/env_fade.qc index 70e738d9..1ecc1dff 100644 --- a/src/gs-entbase/server/env_fade.qc +++ b/src/gs-entbase/server/env_fade.qc @@ -45,9 +45,6 @@ This entity was introduced in Half-Life (1998). class env_fade:NSRenderableEntity { - float m_flFadeDuration; - float m_flFadeHold; - public: void env_fade(void); @@ -56,6 +53,10 @@ public: virtual void Restore(string,string); virtual void Trigger(entity, triggermode_t); virtual void SpawnKey(string,string); + +private: + float m_flFadeDuration; + float m_flFadeHold; }; void diff --git a/src/gs-entbase/server/env_global.qc b/src/gs-entbase/server/env_global.qc index 3929355c..e5012978 100644 --- a/src/gs-entbase/server/env_global.qc +++ b/src/gs-entbase/server/env_global.qc @@ -36,10 +36,7 @@ This entity was introduced in Half-Life (1998). */ class env_global:NSPointTrigger -{ - int m_iTriggerMode; - int m_iInitialState; - +{ public: void env_global(void); @@ -54,6 +51,9 @@ public: nonvirtual void AddNewGlobal(string, globalstate_t); nonvirtual void SetGlobal(string, globalstate_t); +private: + int m_iTriggerMode; + int m_iInitialState; }; void diff --git a/src/gs-entbase/server/env_hudhint.qc b/src/gs-entbase/server/env_hudhint.qc index 88dd0a60..abb8bd63 100644 --- a/src/gs-entbase/server/env_hudhint.qc +++ b/src/gs-entbase/server/env_hudhint.qc @@ -43,8 +43,6 @@ This entity was introduced in Half-Life 2 (2004). class env_hudhint:NSPointTrigger { - string m_strMessage; - public: void env_hudhint(void); @@ -53,6 +51,8 @@ public: virtual void SpawnKey(string,string); virtual void Trigger(entity, triggermode_t); +private: + string m_strMessage; }; void diff --git a/src/gs-entbase/server/env_message.qc b/src/gs-entbase/server/env_message.qc index e846d5e7..988e319c 100644 --- a/src/gs-entbase/server/env_message.qc +++ b/src/gs-entbase/server/env_message.qc @@ -43,10 +43,6 @@ This entity was introduced in Half-Life (1998). class env_message:NSPointTrigger { - string m_strSound; - float m_flVolume; - int m_iAttenuation; /* FIXME: change this to a proper attenuation type */ - public: void env_message(void); @@ -57,6 +53,10 @@ public: nonvirtual void Play(entity, triggermode_t); +private: + string m_strSound; + float m_flVolume; + int m_iAttenuation; /* FIXME: change this to a proper attenuation type */ }; void diff --git a/src/gs-entbase/server/env_shake.qc b/src/gs-entbase/server/env_shake.qc index b613b4fb..9b685115 100644 --- a/src/gs-entbase/server/env_shake.qc +++ b/src/gs-entbase/server/env_shake.qc @@ -38,11 +38,6 @@ This entity was introduced in Half-Life (1998). class env_shake:NSPointTrigger { - float m_flRadius; - float m_flAmplitude; - float m_flDuration; - float m_flFrequency; - public: void env_shake(void); @@ -51,6 +46,11 @@ public: virtual void SpawnKey(string,string); virtual void Trigger(entity, triggermode_t); +private: + float m_flRadius; + float m_flAmplitude; + float m_flDuration; + float m_flFrequency; }; void diff --git a/src/gs-entbase/server/env_spark.qc b/src/gs-entbase/server/env_spark.qc index 61134273..257419db 100644 --- a/src/gs-entbase/server/env_spark.qc +++ b/src/gs-entbase/server/env_spark.qc @@ -50,8 +50,6 @@ This entity was introduced in Half-Life (1998). class env_spark:NSPointTrigger { - float m_flMaxDelay; - public: void env_spark(void); @@ -64,6 +62,8 @@ public: nonvirtual void CreateSpark(void); nonvirtual void TimedSpark(void); +private: + float m_flMaxDelay; }; void diff --git a/src/gs-entbase/server/func_areaportal.qc b/src/gs-entbase/server/func_areaportal.qc index 87d31888..442173e4 100644 --- a/src/gs-entbase/server/func_areaportal.qc +++ b/src/gs-entbase/server/func_areaportal.qc @@ -34,11 +34,6 @@ This entity was introduced in Quake II (1997). class func_areaportal:NSEntity { - bool m_bPortalState; - bool m_bStartOpen; - int m_iPortalNumber; /* Source Engine only */ - bool m_bSourcePortal; - public: void func_areaportal(void); @@ -52,6 +47,12 @@ public: nonvirtual void PortalOpen(void); nonvirtual void PortalClose(void); + +private: + bool m_bPortalState; + bool m_bStartOpen; + int m_iPortalNumber; /* Source Engine only */ + bool m_bSourcePortal; }; void diff --git a/src/gs-entbase/server/func_breakable.qc b/src/gs-entbase/server/func_breakable.qc index 2d053d12..ce2b7329 100644 --- a/src/gs-entbase/server/func_breakable.qc +++ b/src/gs-entbase/server/func_breakable.qc @@ -118,16 +118,6 @@ This entity was introduced in Half-Life (1998). class func_breakable:NSSurfacePropEntity { - float m_flDelay; - float m_flExplodeMag; - float m_flExplodeRad; - string m_strBreakSpawn; - bool m_bCanTouch; - - /*entity m_pressAttacker; - int m_pressType; - int m_pressDamage;*/ - public: void func_breakable(void); @@ -145,6 +135,17 @@ public: virtual void Touch(entity); /*virtual void(void) PressureDeath;*/ + +private: + float m_flDelay; + float m_flExplodeMag; + float m_flExplodeRad; + string m_strBreakSpawn; + bool m_bCanTouch; + + /*entity m_pressAttacker; + int m_pressType; + int m_pressDamage;*/ }; void diff --git a/src/gs-entbase/server/func_brush.qc b/src/gs-entbase/server/func_brush.qc index d41b82de..2c58336f 100644 --- a/src/gs-entbase/server/func_brush.qc +++ b/src/gs-entbase/server/func_brush.qc @@ -41,9 +41,6 @@ This entity was introduced in Half-Life 2 (2004). class func_brush:NSRenderableEntity { - int m_iSolidity; - int m_iStartOff; - public: void func_brush(void); @@ -53,6 +50,9 @@ public: virtual void Trigger(entity, triggermode_t); virtual void SpawnKey(string,string); +private: + int m_iSolidity; + int m_iStartOff; }; void diff --git a/src/gs-entbase/server/func_button.qc b/src/gs-entbase/server/func_button.qc index b0b3d250..83233ea4 100644 --- a/src/gs-entbase/server/func_button.qc +++ b/src/gs-entbase/server/func_button.qc @@ -73,6 +73,24 @@ This entity was introduced in Quake (1996). class func_button:NSMoverEntity { +public: + void func_button(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Spawned(void); + virtual void Respawn(void); + virtual void Touch(entity); + virtual void Blocked(entity); + virtual void Trigger(entity, triggermode_t); + nonvirtual void DeathTrigger(void); + virtual void PlayerUse(void); + + virtual void MoverStartsMoving(void); + virtual void MoverFinishesMoving(void); + +private: moverState_t m_moverState; float m_flSpeed; float m_flLip; @@ -90,23 +108,6 @@ func_button:NSMoverEntity string m_strOnUseLocked; string m_strOnIn; string m_strOnOut; - -public: - void func_button(void); - - virtual void Save(float); - virtual void Restore(string,string); - virtual void SpawnKey(string,string); - virtual void Spawned(void); - virtual void Respawn(void); - virtual void Touch(entity); - virtual void Blocked(entity); - virtual void Trigger(entity, triggermode_t); - nonvirtual void DeathTrigger(void); - virtual void PlayerUse(void); - - virtual void MoverStartsMoving(void); - virtual void MoverFinishesMoving(void); }; void diff --git a/src/gs-entbase/server/func_guntarget.qc b/src/gs-entbase/server/func_guntarget.qc index 8178c8e1..abe7b6f0 100644 --- a/src/gs-entbase/server/func_guntarget.qc +++ b/src/gs-entbase/server/func_guntarget.qc @@ -33,10 +33,6 @@ This entity was introduced in Half-Life (1998). class func_guntarget:NSSurfacePropEntity { - float m_flSpeed; - string m_strOnDeath; - string m_strOnDeathLegacy; - public: void func_guntarget(void); @@ -56,6 +52,10 @@ public: virtual void Input(entity, string, string); +private: + float m_flSpeed; + string m_strOnDeath; + string m_strOnDeathLegacy; }; void diff --git a/src/gs-entbase/server/func_healthcharger.qc b/src/gs-entbase/server/func_healthcharger.qc index cbcf7a85..9f70fab8 100644 --- a/src/gs-entbase/server/func_healthcharger.qc +++ b/src/gs-entbase/server/func_healthcharger.qc @@ -32,14 +32,6 @@ This entity was introduced in Half-Life (1998). class func_healthcharger:NSRenderableEntity { - entity m_eUser; - float m_flDelay; - float m_flCheck; - - string m_strSndFirst; - string m_strSndCharging; - string m_strSndDone; - public: void func_healthcharger(void); @@ -54,6 +46,14 @@ public: virtual void OnPlayerUse(void); nonvirtual void ResetHealth(void); +private: + entity m_eUser; + float m_flDelay; + float m_flCheck; + + string m_strSndFirst; + string m_strSndCharging; + string m_strSndDone; }; void diff --git a/src/gs-entbase/server/func_mortar_field.qc b/src/gs-entbase/server/func_mortar_field.qc index a148b785..9d84ca7f 100644 --- a/src/gs-entbase/server/func_mortar_field.qc +++ b/src/gs-entbase/server/func_mortar_field.qc @@ -45,12 +45,6 @@ This entity was introduced in Half-Life (1998). class func_mortar_field:NSBrushTrigger { - int m_iType; - int m_iCount; - float m_flSpread; - string m_strXController; - string m_strYController; - public: void func_mortar_field(void); @@ -65,6 +59,13 @@ public: nonvirtual void FireRandom(void); nonvirtual void FireTarget(entity); nonvirtual void FireControlled(void); + +private: + int m_iType; + int m_iCount; + float m_flSpread; + string m_strXController; + string m_strYController; }; void diff --git a/src/gs-entbase/server/func_pendulum.qc b/src/gs-entbase/server/func_pendulum.qc index 9ed6f792..2c676e3e 100644 --- a/src/gs-entbase/server/func_pendulum.qc +++ b/src/gs-entbase/server/func_pendulum.qc @@ -52,11 +52,6 @@ This entity was introduced in Half-Life (1998). class func_pendulum:NSRenderableEntity { - int m_iActive; - float m_flProgress; - float m_flDampening; - float m_flDistance; - public: void func_pendulum(void); @@ -67,6 +62,11 @@ public: virtual void Trigger(entity, triggermode_t); virtual void customphysics(void); +private: + int m_iActive; + float m_flProgress; + float m_flDampening; + float m_flDistance; }; void diff --git a/src/gs-entbase/server/func_platrot.qc b/src/gs-entbase/server/func_platrot.qc index 03958a05..f9fc62ef 100644 --- a/src/gs-entbase/server/func_platrot.qc +++ b/src/gs-entbase/server/func_platrot.qc @@ -49,13 +49,6 @@ This entity was introduced in Half-Life (1998). class func_platrot:NSRenderableEntity { - int m_iState; - float m_flSpeed; - float m_flHeight; - string m_strNoise1; - string m_strNoise2; - float m_flRotation; - public: void func_platrot(void); @@ -70,6 +63,14 @@ public: nonvirtual void ArrivedUp(void); nonvirtual void ArrivedDown(void); nonvirtual void MoveToggle(void); + +private: + int m_iState; + float m_flSpeed; + float m_flHeight; + string m_strNoise1; + string m_strNoise2; + float m_flRotation; }; void diff --git a/src/gs-entbase/server/func_recharge.qc b/src/gs-entbase/server/func_recharge.qc index 2e4015da..5ca9bcc9 100644 --- a/src/gs-entbase/server/func_recharge.qc +++ b/src/gs-entbase/server/func_recharge.qc @@ -32,14 +32,7 @@ This entity was introduced in Half-Life (1998). class func_recharge:NSRenderableEntity { - entity m_eUser; - float m_flDelay; - float m_flCheck; - - string m_strSndFirst; - string m_strSndCharging; - string m_strSndDone; - +public: void func_recharge(void); /* overrides */ @@ -53,6 +46,14 @@ func_recharge:NSRenderableEntity virtual void OnPlayerUse(void); nonvirtual void ResetHealth(void); +private: + entity m_eUser; + float m_flDelay; + float m_flCheck; + + string m_strSndFirst; + string m_strSndCharging; + string m_strSndDone; }; void diff --git a/src/gs-entbase/server/func_rot_button.qc b/src/gs-entbase/server/func_rot_button.qc index f21d6e21..8d3c8d49 100644 --- a/src/gs-entbase/server/func_rot_button.qc +++ b/src/gs-entbase/server/func_rot_button.qc @@ -63,13 +63,6 @@ This entity was introduced in Half-Life (1998). class func_rot_button:NSSurfacePropEntity { - vector m_vecMoveAngle; - int m_iState; - - float m_flSpeed; - float m_flDistance; - float m_flReturnTime; - public: void func_rot_button(void); @@ -88,6 +81,12 @@ public: nonvirtual void Rotate(vector, void()); nonvirtual void TurnToggle(void); +private: + vector m_vecMoveAngle; + int m_iState; + float m_flSpeed; + float m_flDistance; + float m_flReturnTime; }; void diff --git a/src/gs-entbase/server/func_rotating.qc b/src/gs-entbase/server/func_rotating.qc index 68978319..f2443b6a 100644 --- a/src/gs-entbase/server/func_rotating.qc +++ b/src/gs-entbase/server/func_rotating.qc @@ -66,11 +66,6 @@ This entity was introduced in Quake II (1997). class func_rotating:NSRenderableEntity { - vector m_vecMoveDir; - float m_flSpeed; - float m_flDamage; - float m_flDir; - public: void func_rotating(void); @@ -86,6 +81,11 @@ public: virtual void Touch(entity); virtual void SetMovementDirection(void); +private: + vector m_vecMoveDir; + float m_flSpeed; + float m_flDamage; + float m_flDir; }; void diff --git a/src/gs-entbase/server/func_tank.qc b/src/gs-entbase/server/func_tank.qc index 14c0b6fb..86a1cbfd 100644 --- a/src/gs-entbase/server/func_tank.qc +++ b/src/gs-entbase/server/func_tank.qc @@ -69,6 +69,20 @@ This entity was introduced in Half-Life (1998). class func_tank:NSVehicle { +public: + void func_tank(void); + + virtual void Spawned(void); + virtual void Save(float); + virtual void Restore(string,string); + virtual void customphysics(void); + virtual void PlayerInput(void); + virtual void Respawn(void); + virtual void SpawnKey(string,string); + nonvirtual void SpriteSmoke(vector); + nonvirtual void SpriteFlash(vector); + +private: /* attributes */ float m_flYawRate; /* TODO */ float m_flYawRange; /* TODO */ @@ -85,22 +99,7 @@ func_tank:NSVehicle float m_flPersistance; /* TODO */ float m_flMinRange; /* TODO */ float m_flMaxRange; /* TODO */ - float m_flFireTime; - -public: - void func_tank(void); - - virtual void Spawned(void); - virtual void Save(float); - virtual void Restore(string,string); - virtual void customphysics(void); - virtual void PlayerInput(void); - virtual void Respawn(void); - virtual void SpawnKey(string,string); - nonvirtual void SpriteSmoke(vector); - nonvirtual void SpriteFlash(vector); - }; void diff --git a/src/gs-entbase/server/func_wall_toggle.qc b/src/gs-entbase/server/func_wall_toggle.qc index 6918c14c..784fdcb6 100644 --- a/src/gs-entbase/server/func_wall_toggle.qc +++ b/src/gs-entbase/server/func_wall_toggle.qc @@ -35,9 +35,6 @@ This entity was introduced in Half-Life (1998). class func_wall_toggle:NSRenderableEntity { - int m_oldmodelindex; - int m_iVisible; - public: void func_wall_toggle(void); @@ -47,6 +44,9 @@ public: virtual void Trigger(entity, triggermode_t); virtual void Input(entity,string,string); +private: + int m_oldmodelindex; + int m_iVisible; }; void diff --git a/src/gs-entbase/server/game_counter.qc b/src/gs-entbase/server/game_counter.qc index 1e900251..c9b9c306 100644 --- a/src/gs-entbase/server/game_counter.qc +++ b/src/gs-entbase/server/game_counter.qc @@ -43,10 +43,6 @@ This entity was introduced in Half-Life (1998). class game_counter:NSPointTrigger { - int m_iStartCount; - int m_iCounted; - int m_iMaxCount; - public: void game_counter(void); @@ -60,6 +56,10 @@ public: nonvirtual int GetCount(void); nonvirtual void SetCount(int); +private: + int m_iStartCount; + int m_iCounted; + int m_iMaxCount; }; void diff --git a/src/gs-entbase/server/game_counter_set.qc b/src/gs-entbase/server/game_counter_set.qc index 0ad5a9cc..f4c69f80 100644 --- a/src/gs-entbase/server/game_counter_set.qc +++ b/src/gs-entbase/server/game_counter_set.qc @@ -39,8 +39,6 @@ enumflags class game_counter_set:NSPointTrigger { - int m_iCount; - public: void game_counter_set(void); @@ -50,6 +48,8 @@ public: virtual void Respawn(void); virtual void SpawnKey(string,string); +private: + int m_iCount; }; void diff --git a/src/gs-entbase/server/game_player_equip.qc b/src/gs-entbase/server/game_player_equip.qc index 00cab111..ac00539f 100644 --- a/src/gs-entbase/server/game_player_equip.qc +++ b/src/gs-entbase/server/game_player_equip.qc @@ -49,8 +49,6 @@ This entity was introduced in Half-Life (1998). class game_player_equip:NSPointTrigger { - string m_strBuffer; - public: void game_player_equip(void); @@ -61,6 +59,8 @@ public: nonvirtual void SpawnUnit(string,vector); +private: + string m_strBuffer; }; void diff --git a/src/gs-entbase/server/game_text.qc b/src/gs-entbase/server/game_text.qc index 61a27131..51ee31c6 100644 --- a/src/gs-entbase/server/game_text.qc +++ b/src/gs-entbase/server/game_text.qc @@ -49,6 +49,16 @@ This entity was introduced in Half-Life (1998). class game_text:NSPointTrigger { +public: + void game_text(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Trigger(entity, triggermode_t); + virtual void Input(entity, string, string); + +private: vector m_vecColor1; vector m_vecColor2; float m_flPosX; @@ -59,16 +69,6 @@ game_text:NSPointTrigger float m_flFXTime; int m_iChannel; int m_iEffect; - -public: - void game_text(void); - - virtual void Save(float); - virtual void Restore(string,string); - virtual void SpawnKey(string,string); - virtual void Trigger(entity, triggermode_t); - virtual void Input(entity, string, string); - }; void diff --git a/src/gs-entbase/server/info_hint.qc b/src/gs-entbase/server/info_hint.qc index ad9ec422..1f7c9926 100644 --- a/src/gs-entbase/server/info_hint.qc +++ b/src/gs-entbase/server/info_hint.qc @@ -140,15 +140,6 @@ However, that was never completed. class info_hint:NSPointTrigger { - hinttype_t m_hintType; - string m_strHintActivity; - float m_flNodeFOV; - bool m_bStartDisabled; - string m_strHintGroup; - ignorefacing_t m_ignoreFacing; - aistate_t m_minState; - aistate_t m_maxState; - public: void info_hint(void); @@ -157,6 +148,15 @@ public: virtual void Restore(string,string); virtual void SpawnKey(string,string); +private: + hinttype_t m_hintType; + string m_strHintActivity; + float m_flNodeFOV; + bool m_bStartDisabled; + string m_strHintGroup; + ignorefacing_t m_ignoreFacing; + aistate_t m_minState; + aistate_t m_maxState; }; void diff --git a/src/gs-entbase/server/infodecal.qc b/src/gs-entbase/server/infodecal.qc index 21a78cad..2cb3150a 100644 --- a/src/gs-entbase/server/infodecal.qc +++ b/src/gs-entbase/server/infodecal.qc @@ -39,9 +39,6 @@ This entity was introduced in Half-Life (1998). class infodecal:NSPointTrigger { - decal m_decChild; - string m_strTexture; - public: void infodecal(void); @@ -52,6 +49,9 @@ public: virtual void Spawned(void); virtual void Trigger(entity, triggermode_t); +private: + decal m_decChild; + string m_strTexture; }; void diff --git a/src/gs-entbase/server/item_food.qc b/src/gs-entbase/server/item_food.qc index 63d460c5..4741b32f 100644 --- a/src/gs-entbase/server/item_food.qc +++ b/src/gs-entbase/server/item_food.qc @@ -30,8 +30,7 @@ It's also known as item_sodacan. class item_food:NSRenderableEntity { - int m_iIsCan; - +public: void item_food(void); virtual void Respawn(void); @@ -39,6 +38,9 @@ item_food:NSRenderableEntity virtual void Restore(string,string); nonvirtual void Setup(void); virtual void Touch(entity); + +private: + int m_iIsCan; }; void @@ -51,8 +53,8 @@ item_food::item_food(void) void item_food::Save(float handle) { - SaveInt(handle, "m_iIsCan", m_iIsCan); super::Save(handle); + SaveInt(handle, "m_iIsCan", m_iIsCan); } void diff --git a/src/gs-entbase/server/item_generic.qc b/src/gs-entbase/server/item_generic.qc index 9ba28c66..4dbfbe8c 100644 --- a/src/gs-entbase/server/item_generic.qc +++ b/src/gs-entbase/server/item_generic.qc @@ -39,6 +39,7 @@ public: virtual void SpawnKey(string, string); virtual void Save(float); virtual void Restore(string, string); + private: string m_strSequenceName; }; diff --git a/src/gs-entbase/server/light.qc b/src/gs-entbase/server/light.qc index b5f6fa6a..6816024f 100644 --- a/src/gs-entbase/server/light.qc +++ b/src/gs-entbase/server/light.qc @@ -68,12 +68,6 @@ This entity was introduced in Quake (1996). class light:NSPointTrigger { - int m_iEnabled; - int m_iStartActive; - float m_flStyle; - float m_flSwitchStyle; - string m_strPattern; - public: void light(void); @@ -86,6 +80,12 @@ public: virtual void RestoreComplete(void); virtual void Trigger(entity, triggermode_t); +private: + int m_iEnabled; + int m_iStartActive; + float m_flStyle; + float m_flSwitchStyle; + string m_strPattern; }; void @@ -101,12 +101,12 @@ light::light(void) void light::Save(float handle) { + super::Save(handle); SaveInt(handle, "m_iEnabled", m_iEnabled); SaveInt(handle, "m_iStartActive", m_iStartActive); SaveFloat(handle, "m_flStyle", m_flStyle); SaveFloat(handle, "m_flSwitchStyle", m_flSwitchStyle); SaveString(handle, "m_strPattern", m_strPattern); - super::Save(handle); } void diff --git a/src/gs-entbase/server/logic_auto.qc b/src/gs-entbase/server/logic_auto.qc index 72ce7d8e..f18dac7d 100644 --- a/src/gs-entbase/server/logic_auto.qc +++ b/src/gs-entbase/server/logic_auto.qc @@ -52,18 +52,6 @@ This entity was introduced in Half-Life 2 (2004). class logic_auto:NSPointTrigger { - /* outputs */ - string m_strOnMapSpawn; - string m_strOnNewGame; - string m_strOnLoadGame; - string m_strOnMapTransition; - string m_strOnBackgroundMap; - string m_strOnMultiNewMap; - string m_strOnMultiNewRound; - - /* temporary */ - int m_iFromSaveGame; - public: void logic_auto(void); @@ -77,6 +65,18 @@ public: nonvirtual void Processing(void); +private: + /* outputs */ + string m_strOnMapSpawn; + string m_strOnNewGame; + string m_strOnLoadGame; + string m_strOnMapTransition; + string m_strOnBackgroundMap; + string m_strOnMultiNewMap; + string m_strOnMultiNewRound; + + /* temporary */ + int m_iFromSaveGame; }; void diff --git a/src/gs-entbase/server/logic_case.qc b/src/gs-entbase/server/logic_case.qc index f10d5cbf..8cd95f99 100644 --- a/src/gs-entbase/server/logic_case.qc +++ b/src/gs-entbase/server/logic_case.qc @@ -80,6 +80,8 @@ public: virtual void Restore(string,string); virtual void Input(entity, string, string); + nonvirtual void CompareCase(entity, string); + private: string m_strCase01; @@ -117,8 +119,6 @@ private: string m_strOnCase16; string m_strOnDefault; - - nonvirtual void CompareCase(entity, string); }; void diff --git a/src/gs-entbase/server/momentary_rot_button.qc b/src/gs-entbase/server/momentary_rot_button.qc index 295e81da..2735bb2d 100644 --- a/src/gs-entbase/server/momentary_rot_button.qc +++ b/src/gs-entbase/server/momentary_rot_button.qc @@ -50,8 +50,6 @@ This entity was introduced in Half-Life (1998). class momentary_rot_button:NSMomentary { - int m_iTurnDir; - public: void momentary_rot_button(void); @@ -68,6 +66,8 @@ public: virtual void MovementStateChanged(void); virtual float GetProgress(void); +private: + int m_iTurnDir; }; void diff --git a/src/gs-entbase/server/momentarybase.qc b/src/gs-entbase/server/momentarybase.qc index e419eb0c..6756544c 100644 --- a/src/gs-entbase/server/momentarybase.qc +++ b/src/gs-entbase/server/momentarybase.qc @@ -26,20 +26,6 @@ typedef enum class NSMomentary:NSRenderableEntity { -private: - entity m_eUser; - vector m_vecMoveDir; - vector m_vecPos1; - vector m_vecPos2; - vector m_vecDest; - - int m_iMoveState; - - /* map keys */ - float m_flDistance; - float m_flSpeed; - float m_flReturnspeed; - public: void NSMomentary(void); @@ -54,6 +40,19 @@ public: /** Returns the progress of the momentary, which is a value between 0.0 and 1.0. */ virtual float GetProgress(void); +private: + entity m_eUser; + vector m_vecMoveDir; + vector m_vecPos1; + vector m_vecPos2; + vector m_vecDest; + + int m_iMoveState; + + /* map keys */ + float m_flDistance; + float m_flSpeed; + float m_flReturnspeed; }; void diff --git a/src/gs-entbase/server/monstermaker.qc b/src/gs-entbase/server/monstermaker.qc index adc5f0e2..4e54b0b4 100644 --- a/src/gs-entbase/server/monstermaker.qc +++ b/src/gs-entbase/server/monstermaker.qc @@ -49,13 +49,6 @@ enumflags class monstermaker:NSPointTrigger { - string m_strMonster; - string m_strChildName; - int m_iMonsterSpawned; - int m_iTotalMonsters; - int m_iMaxChildren; - float m_flDelay; - public: void monstermaker(void); @@ -70,6 +63,13 @@ public: nonvirtual void TurnOn(void); nonvirtual void TurnOff(void); +private: + string m_strMonster; + string m_strChildName; + int m_iMonsterSpawned; + int m_iTotalMonsters; + int m_iMaxChildren; + float m_flDelay; }; void diff --git a/src/gs-entbase/server/multi_manager.qc b/src/gs-entbase/server/multi_manager.qc index 0c06a78e..a66c4b42 100644 --- a/src/gs-entbase/server/multi_manager.qc +++ b/src/gs-entbase/server/multi_manager.qc @@ -35,10 +35,6 @@ This entity was introduced in Half-Life (1998). class multi_manager_sub:NSPointTrigger { - entity m_eActivator; - int m_iValue; - float m_flUntilTriggered; - public: void multi_manager_sub(void); @@ -46,6 +42,10 @@ public: virtual void Save(float); virtual void Restore(string,string); +private: + entity m_eActivator; + int m_iValue; + float m_flUntilTriggered; }; void diff --git a/src/gs-entbase/server/player_loadsaved.qc b/src/gs-entbase/server/player_loadsaved.qc index b0caf0a0..bb3cb3dc 100644 --- a/src/gs-entbase/server/player_loadsaved.qc +++ b/src/gs-entbase/server/player_loadsaved.qc @@ -35,11 +35,6 @@ This entity was introduced in Half-Life (1998). class player_loadsaved:NSRenderableEntity /* for the rendercolor values */ { - string m_strMessage; - float m_flLoadTime; - float m_flFadeDuration; - float m_flFadeHold; - public: void player_loadsaved(void); @@ -51,6 +46,11 @@ public: nonvirtual void ReloadSave(void); +private: + string m_strMessage; + float m_flLoadTime; + float m_flFadeDuration; + float m_flFadeHold; }; void diff --git a/src/gs-entbase/server/point_camera.qc b/src/gs-entbase/server/point_camera.qc index 1c37b5e7..8f3efb70 100644 --- a/src/gs-entbase/server/point_camera.qc +++ b/src/gs-entbase/server/point_camera.qc @@ -43,13 +43,6 @@ This entity was introduced in Half-Life 2 (2004). class point_camera:NSPointTrigger { - int m_iUseSAR; - int m_iUseFog; - vector m_vecFogColor; - float m_flFogStart; - float m_flFogEnd; - float m_flFOV; - public: void point_camera(void); @@ -59,6 +52,14 @@ public: virtual void SpawnKey(string,string); virtual void Respawn(void); virtual void Input(entity,string,string); + +private: + int m_iUseSAR; + int m_iUseFog; + vector m_vecFogColor; + float m_flFogStart; + float m_flFogEnd; + float m_flFOV; }; void diff --git a/src/gs-entbase/server/prop_door_rotating.qc b/src/gs-entbase/server/prop_door_rotating.qc index 2defef1f..63b46a43 100644 --- a/src/gs-entbase/server/prop_door_rotating.qc +++ b/src/gs-entbase/server/prop_door_rotating.qc @@ -24,11 +24,6 @@ class prop_door_rotating:NSPointTrigger { - vector m_vecDest1; - vector m_vecDest2; - float m_flDistance; - float m_flSpeed; - public: void prop_door_rotating(void); @@ -42,6 +37,12 @@ public: nonvirtual void Turn(vector,void(void)); nonvirtual void Opened(void); nonvirtual void Closed(void); + +private: + vector m_vecDest1; + vector m_vecDest2; + float m_flDistance; + float m_flSpeed; }; void diff --git a/src/gs-entbase/server/random_speaker.qc b/src/gs-entbase/server/random_speaker.qc index c55e4aa0..0ffa2ca8 100644 --- a/src/gs-entbase/server/random_speaker.qc +++ b/src/gs-entbase/server/random_speaker.qc @@ -41,11 +41,6 @@ It was introduced in Gunman Chronicles (2000). class random_speaker:NSPointTrigger { - string m_strSample; - float m_flVolume; - float m_flMinPos; - float m_flRandPercent; - public: void random_speaker(void); @@ -60,6 +55,11 @@ public: nonvirtual void Enable(void); nonvirtual void Disable(void); +private: + string m_strSample; + float m_flVolume; + float m_flMinPos; + float m_flRandPercent; }; void diff --git a/src/gs-entbase/server/random_trigger.qc b/src/gs-entbase/server/random_trigger.qc index 2e76fcfa..954d8ae9 100644 --- a/src/gs-entbase/server/random_trigger.qc +++ b/src/gs-entbase/server/random_trigger.qc @@ -34,11 +34,6 @@ It was introduced in Gunman Chronicles (2000). class random_trigger:NSPointTrigger { - float m_flMinTime; - float m_flRandMin; - float m_flRandMax; - int m_iStartState; - public: void random_trigger(void); @@ -48,6 +43,11 @@ public: virtual void Respawn(void); virtual void Trigger(entity, triggermode_t); +private: + float m_flMinTime; + float m_flRandMin; + float m_flRandMax; + int m_iStartState; }; void diff --git a/src/gs-entbase/server/scripted_sentence.qc b/src/gs-entbase/server/scripted_sentence.qc index af05680a..eb289b68 100644 --- a/src/gs-entbase/server/scripted_sentence.qc +++ b/src/gs-entbase/server/scripted_sentence.qc @@ -35,13 +35,6 @@ This entity was introduced in Half-Life (1998). class scripted_sentence:NSPointTrigger { - string m_strSpeaker; - string m_strSentence; - float m_flDelay; - float m_flWait; - float m_flPitch; - float m_flDuration; - public: void scripted_sentence(void); @@ -51,6 +44,13 @@ public: virtual void SpawnKey(string,string); virtual void Trigger(entity, triggermode_t); +private: + string m_strSpeaker; + string m_strSentence; + float m_flDelay; + float m_flWait; + float m_flPitch; + float m_flDuration; }; void diff --git a/src/gs-entbase/server/speaker.qc b/src/gs-entbase/server/speaker.qc index 86c81ea0..052777ed 100644 --- a/src/gs-entbase/server/speaker.qc +++ b/src/gs-entbase/server/speaker.qc @@ -67,9 +67,6 @@ This entity was introduced in Half-Life (1998). class speaker:NSTalkMonster { - string m_strSentence; - float m_flVolume; - public: void speaker(void); @@ -82,6 +79,9 @@ public: nonvirtual void Announce(void); +private: + string m_strSentence; + float m_flVolume; }; void diff --git a/src/gs-entbase/server/targ_speaker.qc b/src/gs-entbase/server/targ_speaker.qc index a00cb3e8..6dabe454 100644 --- a/src/gs-entbase/server/targ_speaker.qc +++ b/src/gs-entbase/server/targ_speaker.qc @@ -36,9 +36,6 @@ to be played. class targ_speaker:NSPointTrigger { - string m_strSample; - float m_flVolume; - public: void targ_speaker(void); @@ -48,6 +45,9 @@ public: virtual void Respawn(void); virtual void Trigger(entity, triggermode_t); +private: + string m_strSample; + float m_flVolume; }; void diff --git a/src/gs-entbase/server/target_cdaudio.qc b/src/gs-entbase/server/target_cdaudio.qc index 46cdcc9a..95c889bf 100644 --- a/src/gs-entbase/server/target_cdaudio.qc +++ b/src/gs-entbase/server/target_cdaudio.qc @@ -34,9 +34,6 @@ This entity was introduced in Half-Life (1998). class target_cdaudio:NSPointTrigger { - float m_flRadius; - int m_iCDTrack; - public: void target_cdaudio(void); @@ -46,6 +43,9 @@ public: virtual void Respawn(void); virtual void Touch(entity); +private: + float m_flRadius; + int m_iCDTrack; }; void diff --git a/src/gs-entbase/server/trigger_auto.qc b/src/gs-entbase/server/trigger_auto.qc index 7882b676..8120319a 100644 --- a/src/gs-entbase/server/trigger_auto.qc +++ b/src/gs-entbase/server/trigger_auto.qc @@ -37,9 +37,6 @@ This entity was introduced in Half-Life (1998). class trigger_auto:NSPointTrigger { - triggermode_t m_iTriggerState; - float m_flDelay; - public: void trigger_auto(void); @@ -52,6 +49,9 @@ public: nonvirtual void Processing(void); +private: + triggermode_t m_iTriggerState; + float m_flDelay; }; void diff --git a/src/gs-entbase/server/trigger_autosave.qc b/src/gs-entbase/server/trigger_autosave.qc index e791b46e..669bd299 100644 --- a/src/gs-entbase/server/trigger_autosave.qc +++ b/src/gs-entbase/server/trigger_autosave.qc @@ -28,8 +28,6 @@ This entity was introduced in Half-Life (1998). class trigger_autosave:NSBrushTrigger { - float m_flDelay; - public: void trigger_autosave(void); @@ -38,6 +36,9 @@ public: virtual void Spawned(void); virtual void Respawn(void); virtual void Touch(entity); + +private: + float m_flDelay; }; void diff --git a/src/gs-entbase/server/trigger_cdaudio.qc b/src/gs-entbase/server/trigger_cdaudio.qc index 8709a22b..f42021c6 100644 --- a/src/gs-entbase/server/trigger_cdaudio.qc +++ b/src/gs-entbase/server/trigger_cdaudio.qc @@ -29,8 +29,6 @@ This entity was introduced in Half-Life (1998). class trigger_cdaudio:NSBrushTrigger { - int m_iCDTrack; - public: void trigger_cdaudio(void); @@ -41,6 +39,8 @@ public: virtual void Trigger(entity, triggermode_t); virtual void Touch(entity); +private: + int m_iCDTrack; }; void diff --git a/src/gs-entbase/server/trigger_changelevel.qc b/src/gs-entbase/server/trigger_changelevel.qc index d57f9b86..06ddb9bd 100644 --- a/src/gs-entbase/server/trigger_changelevel.qc +++ b/src/gs-entbase/server/trigger_changelevel.qc @@ -83,13 +83,6 @@ ChangeTarget_Activate(void) class trigger_changelevel:NSBrushTrigger { - float m_flChangeDelay; - string m_strChangeTarget; - string m_strMap; - string m_strLandmark; - string m_strOnLevelChange; - entity m_activator; - public: void trigger_changelevel(void); @@ -106,6 +99,14 @@ public: virtual void Change(void); virtual void Touch(entity); virtual int IsInside(entity,entity); + +private: + float m_flChangeDelay; + string m_strChangeTarget; + string m_strMap; + string m_strLandmark; + string m_strOnLevelChange; + entity m_activator; }; void diff --git a/src/gs-entbase/server/trigger_counter.qc b/src/gs-entbase/server/trigger_counter.qc index 857dbe24..2e058435 100644 --- a/src/gs-entbase/server/trigger_counter.qc +++ b/src/gs-entbase/server/trigger_counter.qc @@ -39,9 +39,6 @@ This entity was introduced in Quake (1996). class trigger_counter:NSBrushTrigger { - int m_iCounted; - int m_iMaxCount; - public: void trigger_counter(void); @@ -52,6 +49,9 @@ public: virtual void Trigger(entity, triggermode_t); virtual void Touch(entity); +private: + int m_iCounted; + int m_iMaxCount; }; void @@ -116,7 +116,7 @@ trigger_counter::Trigger(entity act, triggermode_t state) m_iCounted++; - dprint("^2trigger_counter::^3Trigger^7: " \ + NSLog("^2trigger_counter::^3Trigger^7: " \ "Incremented '%s' by 1 (%i/%i)\n", \ targetname, m_iCounted, m_iMaxCount); diff --git a/src/gs-entbase/server/trigger_relay.qc b/src/gs-entbase/server/trigger_relay.qc index fdec1a45..23f3f767 100644 --- a/src/gs-entbase/server/trigger_relay.qc +++ b/src/gs-entbase/server/trigger_relay.qc @@ -40,10 +40,6 @@ This entity was introduced in Quake (1996). class trigger_relay:NSPointTrigger { -private: - triggermode_t m_iTriggerState; - int m_iEnabled; - public: void trigger_relay(void); @@ -53,6 +49,10 @@ public: virtual void Save(float); virtual void Restore(string,string); + +private: + triggermode_t m_iTriggerState; + int m_iEnabled; }; void diff --git a/src/gs-entbase/shared/env_bubbles.qc b/src/gs-entbase/shared/env_bubbles.qc index de075ac4..7488c220 100644 --- a/src/gs-entbase/shared/env_bubbles.qc +++ b/src/gs-entbase/shared/env_bubbles.qc @@ -58,16 +58,6 @@ This entity was introduced in Half-Life (1998). class env_bubbles:NSPointTrigger { - PREDICTED_INT(m_iDensity) - PREDICTED_FLOAT(m_flFrequency) - PREDICTED_FLOAT(m_flCurrent) - PREDICTED_BOOL(m_bEnabled) - - /* spawn values */ - int m_iSpawnDensity; - float m_flSpawnFrequency; - float m_flSpawnCurrent; - public: void env_bubbles(void); @@ -87,6 +77,17 @@ public: virtual void EmitBubbles(void); virtual void ReceiveEntity(float,float); #endif + +private: + PREDICTED_INT(m_iDensity) + PREDICTED_FLOAT(m_flFrequency) + PREDICTED_FLOAT(m_flCurrent) + PREDICTED_BOOL(m_bEnabled) + + /* spawn values */ + int m_iSpawnDensity; + float m_flSpawnFrequency; + float m_flSpawnCurrent; }; void diff --git a/src/gs-entbase/shared/env_fire.qc b/src/gs-entbase/shared/env_fire.qc index 64807c00..fc4a7645 100644 --- a/src/gs-entbase/shared/env_fire.qc +++ b/src/gs-entbase/shared/env_fire.qc @@ -65,6 +65,14 @@ This entity was introduced in Half-Life 2 (2004). class env_fire:NSPointTrigger { +public: + void env_fire(void); + +#ifdef SERVER + virtual void SpawnKey(string strKey, string strValue); +#endif + +private: PREDICTED_FLOAT(m_flSize) PREDICTED_BOOL(m_bState) PREDICTED_FLOAT m_flMaxSize) @@ -73,12 +81,6 @@ env_fire:NSPointTrigger float m_flIgnitionPoint; float m_flDamageScale; float m_flDuration; - - void env_fire(void); - -#ifdef SERVER - virtual void SpawnKey(string strKey, string strValue); -#endif }; void diff --git a/src/gs-entbase/shared/env_fog_controller.qc b/src/gs-entbase/shared/env_fog_controller.qc index d1137c89..0fcbe966 100644 --- a/src/gs-entbase/shared/env_fog_controller.qc +++ b/src/gs-entbase/shared/env_fog_controller.qc @@ -65,6 +65,28 @@ This entity was introduced in Half-Life 2 (2004). class env_fog_controller:NSPointTrigger { +public: + void env_fog_controller(void); + +#ifdef CLIENT + virtual float StartToBias(void); + virtual float FogRender(void); + virtual void FogUpdate(void); + virtual void RendererRestarted(void); + virtual void ReceiveEntity(float,float); +#endif + +#ifdef SERVER + virtual float SendEntity(entity,float); + virtual void EvaluateEntity(void); + virtual void Trigger(entity, triggermode_t); + virtual void Respawn(void); + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Input(entity, string, string); +#endif + private: #ifdef CLIENT /* temporary attributes */ @@ -94,28 +116,6 @@ private: PREDICTED_VECTOR(m_vecFogColor) PREDICTED_VECTOR(m_vecFogColor2) PREDICTED_VECTOR(m_vecFogDir) - -public: - void env_fog_controller(void); - -#ifdef CLIENT - virtual float StartToBias(void); - virtual float FogRender(void); - virtual void FogUpdate(void); - virtual void RendererRestarted(void); - virtual void ReceiveEntity(float,float); -#endif - -#ifdef SERVER - virtual float SendEntity(entity,float); - virtual void EvaluateEntity(void); - virtual void Trigger(entity, triggermode_t); - virtual void Respawn(void); - virtual void Save(float); - virtual void Restore(string,string); - virtual void SpawnKey(string,string); - virtual void Input(entity, string, string); -#endif }; #ifdef CLIENT diff --git a/src/gs-entbase/shared/env_projectedtexture.qc b/src/gs-entbase/shared/env_projectedtexture.qc index 69397de9..102a6fa2 100644 --- a/src/gs-entbase/shared/env_projectedtexture.qc +++ b/src/gs-entbase/shared/env_projectedtexture.qc @@ -63,20 +63,6 @@ This entity was introduced in Half-Life 2: Episode One (2006). */ class env_projectedtexture:NSPointTrigger { -private: - vector m_vecLight; - float m_flIntensity; - float m_flInnerCone; - float m_flCone; - float m_flFarZ; - float m_flNearZ; - float m_flRadius; - float m_flStyle; - string m_strPattern; - string m_strTextureName; - float m_flFOV; - int m_iState; - public: void env_projectedtexture(void); @@ -91,6 +77,20 @@ public: virtual void EvaluateEntity(void); virtual void Input(entity, string, string); #endif + +private: + vector m_vecLight; + float m_flIntensity; + float m_flInnerCone; + float m_flCone; + float m_flFarZ; + float m_flNearZ; + float m_flRadius; + float m_flStyle; + string m_strPattern; + string m_strTextureName; + float m_flFOV; + int m_iState; }; #ifdef CLIENT diff --git a/src/gs-entbase/shared/env_sprite.qc b/src/gs-entbase/shared/env_sprite.qc index c650c520..f4d41d8a 100644 --- a/src/gs-entbase/shared/env_sprite.qc +++ b/src/gs-entbase/shared/env_sprite.qc @@ -61,19 +61,6 @@ This entity was introduced in Half-Life (1998). */ class env_sprite:NSRenderableEntity { -private: - bool m_iIsShader; - int m_iToggled; - float m_flEffects; - - NETWORKED_STRING(m_strMaterial) - NETWORKED_FLOAT(m_flFramerate) - -#ifdef CLIENT - int m_iMaxFrame; - bool m_bLoops; -#endif - public: void env_sprite(void); @@ -92,7 +79,19 @@ public: virtual void ReceiveEntity(float,float); virtual void SetMaxFrame(int); virtual void SetLoopFlag(bool); +#endif +private: + bool m_iIsShader; + int m_iToggled; + float m_flEffects; + + NETWORKED_STRING(m_strMaterial) + NETWORKED_FLOAT(m_flFramerate) + +#ifdef CLIENT + int m_iMaxFrame; + bool m_bLoops; #endif }; diff --git a/src/gs-entbase/shared/func_conveyor.qc b/src/gs-entbase/shared/func_conveyor.qc index f3c5c75b..b2153bcb 100644 --- a/src/gs-entbase/shared/func_conveyor.qc +++ b/src/gs-entbase/shared/func_conveyor.qc @@ -58,10 +58,6 @@ This entity was introduced in Quake II (1997). class func_conveyor:NSRenderableEntity { - PREDICTED_FLOAT(m_flSpeed) - PREDICTED_VECTOR(m_vecMoveDir) - PREDICTED_FLOAT_N(spawnflags) - public: void(void) func_conveyor; @@ -83,6 +79,10 @@ public: virtual void ReceiveEntity(float, float); #endif +private: + PREDICTED_FLOAT(m_flSpeed) + PREDICTED_VECTOR(m_vecMoveDir) + PREDICTED_FLOAT_N(spawnflags) }; void diff --git a/src/gs-entbase/shared/func_friction.qc b/src/gs-entbase/shared/func_friction.qc index 7c90da4e..b68be97a 100644 --- a/src/gs-entbase/shared/func_friction.qc +++ b/src/gs-entbase/shared/func_friction.qc @@ -32,15 +32,15 @@ This entity was introduced in Half-Life (1998). */ class func_friction:NSEntity { -private: - float m_flFriction; - public: void func_friction(void); virtual void Touch(entity); virtual void Respawn(void); virtual void SpawnKey(string,string); + +private: + float m_flFriction; }; void diff --git a/src/gs-entbase/shared/func_monitor.qc b/src/gs-entbase/shared/func_monitor.qc index 2ded38c5..cd68a159 100644 --- a/src/gs-entbase/shared/func_monitor.qc +++ b/src/gs-entbase/shared/func_monitor.qc @@ -74,18 +74,6 @@ This entity was introduced in Half-Life 2 (2004). */ class func_monitor:NSRenderableEntity { - /* these mirror the fields of a point_camera */ - PREDICTED_VECTOR(m_vecCamOrigin) - PREDICTED_VECTOR(m_vecCamAngles) - PREDICTED_FLOAT(m_flFOV) - PREDICTED_INT(m_iUseSAR) - PREDICTED_VECTOR(m_vecFogColor) - PREDICTED_FLOAT(m_flFogStart) - PREDICTED_FLOAT(m_flFogEnd) - PREDICTED_BOOL(m_bState) - int m_iCamValue; - int m_iUseFog; - public: void func_monitor(void); @@ -100,6 +88,19 @@ public: virtual void Trigger(entity, triggermode_t); virtual void Input(entity, string, string); #endif + +private: + /* these mirror the fields of a point_camera */ + PREDICTED_VECTOR(m_vecCamOrigin) + PREDICTED_VECTOR(m_vecCamAngles) + PREDICTED_FLOAT(m_flFOV) + PREDICTED_INT(m_iUseSAR) + PREDICTED_VECTOR(m_vecFogColor) + PREDICTED_FLOAT(m_flFogStart) + PREDICTED_FLOAT(m_flFogEnd) + PREDICTED_BOOL(m_bState) + int m_iCamValue; + int m_iUseFog; }; #ifdef CLIENT diff --git a/src/gs-entbase/shared/func_tankmortar.qc b/src/gs-entbase/shared/func_tankmortar.qc index 474c3343..388ebdfc 100644 --- a/src/gs-entbase/shared/func_tankmortar.qc +++ b/src/gs-entbase/shared/func_tankmortar.qc @@ -63,24 +63,6 @@ This entity was introduced in Half-Life (1998). */ class func_tankmortar:NSVehicle { - /* attributes */ - float m_flYawRate; - float m_flPitchRate; - vector m_vecTipPos; - float m_flFireRate; - int m_iDamage; - string m_strSpriteSmoke; - string m_strSpriteFlash; - float m_flSpriteScale; - vector m_vecSpread; /* TODO: Needs checking */ - string m_strSndRotate; /* TODO */ - float m_flPersistance; /* TODO */ - float m_flMinRange; /* TODO */ - float m_flMaxRange; /* TODO */ - float m_flYawRange; /* TODO */ - float m_flPitchRange; /* TODO */ - float m_flFireTime; - public: void func_tankmortar(void); @@ -101,6 +83,24 @@ public: virtual void SpawnKey(string,string); #endif +private: + /* attributes */ + float m_flYawRate; + float m_flPitchRate; + vector m_vecTipPos; + float m_flFireRate; + int m_iDamage; + string m_strSpriteSmoke; + string m_strSpriteFlash; + float m_flSpriteScale; + vector m_vecSpread; /* TODO: Needs checking */ + string m_strSndRotate; /* TODO */ + float m_flPersistance; /* TODO */ + float m_flMinRange; /* TODO */ + float m_flMaxRange; /* TODO */ + float m_flYawRange; /* TODO */ + float m_flPitchRange; /* TODO */ + float m_flFireTime; }; diff --git a/src/gs-entbase/shared/func_vehicle.qc b/src/gs-entbase/shared/func_vehicle.qc index 91140657..6c5b452b 100644 --- a/src/gs-entbase/shared/func_vehicle.qc +++ b/src/gs-entbase/shared/func_vehicle.qc @@ -39,6 +39,7 @@ enumflags class func_vehicle_wheel { + private: #ifdef CLIENT vector origin_net; diff --git a/src/gs-entbase/shared/info_particle_system.qc b/src/gs-entbase/shared/info_particle_system.qc index e97dcc4d..0e8ccc5b 100644 --- a/src/gs-entbase/shared/info_particle_system.qc +++ b/src/gs-entbase/shared/info_particle_system.qc @@ -47,15 +47,6 @@ This entity was introduced in The Orange Box (2007). */ class info_particle_system:NSPointTrigger { -private: -#ifdef CLIENT - int m_iValue; - int m_iEffectID; -#endif - string m_strEffectName; - float m_flInterval; - int m_iSpawnCount; - public: void info_particle_system(void); @@ -70,6 +61,15 @@ public: virtual void Trigger(entity, triggermode_t); virtual void Input(entity, string, string); #endif + +private: +#ifdef CLIENT + int m_iValue; + int m_iEffectID; +#endif + string m_strEffectName; + float m_flInterval; + int m_iSpawnCount; }; #ifdef CLIENT diff --git a/src/gs-entbase/shared/light_dynamic.qc b/src/gs-entbase/shared/light_dynamic.qc index 80831934..33e9825d 100644 --- a/src/gs-entbase/shared/light_dynamic.qc +++ b/src/gs-entbase/shared/light_dynamic.qc @@ -71,18 +71,6 @@ This entity was introduced in Half-Life 2 (2004). */ class light_dynamic:NSPointTrigger { - vector m_vecLight; - float m_flIntensity; - float m_flInnerCone; - float m_flCone; - float m_flDistance; - float m_flRadius; - float m_flStyle; - string m_strPattern; - int m_iState; - int m_iStartActive; - float m_light; /* our light handle */ - public: void light_dynamic(void); virtual void SpawnKey(string,string); @@ -100,6 +88,19 @@ public: virtual void EvaluateEntity(void); virtual void Input(entity, string, string); #endif + +private: + vector m_vecLight; + float m_flIntensity; + float m_flInnerCone; + float m_flCone; + float m_flDistance; + float m_flRadius; + float m_flStyle; + string m_strPattern; + int m_iState; + int m_iStartActive; + float m_light; /* our light handle */ }; #ifdef CLIENT diff --git a/src/gs-entbase/shared/point_spotlight.qc b/src/gs-entbase/shared/point_spotlight.qc index 746b4fb2..34a11cb9 100644 --- a/src/gs-entbase/shared/point_spotlight.qc +++ b/src/gs-entbase/shared/point_spotlight.qc @@ -49,12 +49,6 @@ This entity was introduced in Half-Life 2 (2004). */ class point_spotlight:NSPointTrigger { -private: - PREDICTED_VECTOR(m_vecColor) - PREDICTED_FLOAT(m_flBeamLength) - PREDICTED_FLOAT(m_flBeamWidth) - PREDICTED_INT(m_iState) - public: void point_spotlight(void); @@ -76,6 +70,12 @@ public: virtual void EvaluateEntity(void); virtual void Input(entity, string, string); #endif + +private: + PREDICTED_VECTOR(m_vecColor) + PREDICTED_FLOAT(m_flBeamLength) + PREDICTED_FLOAT(m_flBeamWidth) + PREDICTED_INT(m_iState) }; #ifdef CLIENT diff --git a/src/gs-entbase/shared/prop_physics_multiplayer.qc b/src/gs-entbase/shared/prop_physics_multiplayer.qc index d5fe8217..a7c45eaa 100644 --- a/src/gs-entbase/shared/prop_physics_multiplayer.qc +++ b/src/gs-entbase/shared/prop_physics_multiplayer.qc @@ -38,8 +38,6 @@ This entity was introduced in Half-Life 2 (2004). */ class prop_physics_multiplayer:NSPhysicsEntity { - int m_iPhysicsMode; - public: void prop_physics_multiplayer(void); @@ -50,6 +48,9 @@ public: virtual void SpawnKey(string,string); virtual void Touch(entity); virtual void TouchThink(void); + +private: + int m_iPhysicsMode; }; void diff --git a/src/gs-entbase/shared/prop_vehicle_driveable.qc b/src/gs-entbase/shared/prop_vehicle_driveable.qc index 03d4cfee..22a176e2 100644 --- a/src/gs-entbase/shared/prop_vehicle_driveable.qc +++ b/src/gs-entbase/shared/prop_vehicle_driveable.qc @@ -32,16 +32,6 @@ enumflags class prop_vehicle_driveable_wheel { -private: - float m_flSuspension; - float m_flSuspensionForce; - -#ifdef CLIENT - vector origin_net; - vector velocity_net; - vector angles_net; -#endif - public: void prop_vehicle_driveable_wheel(void); @@ -55,6 +45,16 @@ public: virtual void Bounce(vector); virtual void Accel(float,float); virtual void Physics(float,float); + +private: + float m_flSuspension; + float m_flSuspensionForce; + +#ifdef CLIENT + vector origin_net; + vector velocity_net; + vector angles_net; +#endif }; /*!QUAKED prop_vehicle_driveable (1 0 0) (-50 -50 0) (50 50 70) diff --git a/src/gs-entbase/shared/trigger_gravity.qc b/src/gs-entbase/shared/trigger_gravity.qc index 9029a24b..55c9355c 100644 --- a/src/gs-entbase/shared/trigger_gravity.qc +++ b/src/gs-entbase/shared/trigger_gravity.qc @@ -34,8 +34,6 @@ This entity was introduced in Quake II (1997). */ class trigger_gravity:NSBrushTrigger { - float m_flGravity; - public: void trigger_gravity(void); @@ -47,6 +45,9 @@ public: virtual void Spawned(void); virtual void Respawn(void); virtual void Touch(entity); + +private: + float m_flGravity; }; void