From 56ec44700a56ea25cdede6373275648172317671 Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Tue, 6 Dec 2022 15:04:07 -0800 Subject: [PATCH] Lots of cleanup related to many entity classes to aid doxygen with generating documentation. --- Documentation/Main.md | 2 +- Documentation/Materials/MatOverview.md | 2 +- Documentation/Models/VVM_Tutorial.md | 2 +- Documentation/Sound/SoundDefs.md | 6 +- README.md | 90 +------------ build_engine.sh | 0 make_mapdef.sh | 6 +- src/gs-entbase/client/env_cubemap.qc | 8 +- src/gs-entbase/client/env_glow.qc | 20 +-- src/gs-entbase/client/env_laser.qc | 12 +- src/gs-entbase/client/env_particle.qc | 14 +- src/gs-entbase/client/env_sound.qc | 12 +- src/gs-entbase/client/env_soundscape.qc | 12 +- src/gs-entbase/client/env_sprite.qc | 0 src/gs-entbase/client/env_sun.qc | 18 +-- src/gs-entbase/client/func_dustcloud.qc | 22 +-- src/gs-entbase/client/func_dustmotes.qc | 14 +- src/gs-entbase/client/func_lod.qc | 14 +- src/gs-entbase/client/func_smokevolume.qc | 23 ++-- src/gs-entbase/client/info_notnull.qc | 3 +- src/gs-entbase/client/infodecal.qc | 10 +- src/gs-entbase/client/light_environment.qc | 8 +- src/gs-entbase/client/point_message.qc | 9 +- src/gs-entbase/client/prop_static.qc | 14 +- src/gs-entbase/client/sky_camera.qc | 5 +- src/gs-entbase/server/button_target.qc | 9 +- src/gs-entbase/server/cycler.qc | 8 +- src/gs-entbase/server/env_beam.qc | 3 +- src/gs-entbase/server/env_beverage.qc | 14 +- src/gs-entbase/server/env_explosion.qc | 16 ++- src/gs-entbase/server/env_fade.qc | 13 +- src/gs-entbase/server/env_global.qc | 24 ++-- src/gs-entbase/server/env_hudhint.qc | 12 +- src/gs-entbase/server/env_laser.qc | 20 +-- src/gs-entbase/server/env_message.qc | 16 ++- src/gs-entbase/server/env_render.qc | 7 +- src/gs-entbase/server/env_shake.qc | 12 +- src/gs-entbase/server/env_shooter.qc | 18 +-- src/gs-entbase/server/env_spark.qc | 20 +-- src/gs-entbase/server/func_areaportal.qc | 18 +-- src/gs-entbase/server/func_breakable.qc | 27 ++-- src/gs-entbase/server/func_brush.qc | 14 +- src/gs-entbase/server/func_button.qc | 34 ++--- src/gs-entbase/server/func_conveyor.qc | 18 +-- src/gs-entbase/server/func_door.qc | 1 + src/gs-entbase/server/func_door_rotating.qc | 41 +++--- src/gs-entbase/server/func_guntarget.qc | 29 ++-- src/gs-entbase/server/func_healthcharger.qc | 22 +-- src/gs-entbase/server/func_lod.qc | 10 +- src/gs-entbase/server/func_mortar_field.qc | 25 ++-- src/gs-entbase/server/func_pendulum.qc | 16 ++- src/gs-entbase/server/func_physbox.qc | 2 + src/gs-entbase/server/func_plat.qc | 24 ++-- src/gs-entbase/server/func_platrot.qc | 24 ++-- src/gs-entbase/server/func_pushable.qc | 18 +-- src/gs-entbase/server/func_recharge.qc | 21 +-- src/gs-entbase/server/func_rot_button.qc | 30 +++-- src/gs-entbase/server/func_rotating.qc | 24 ++-- src/gs-entbase/server/func_tank.qc | 22 +-- src/gs-entbase/server/func_tankcontrols.qc | 8 +- src/gs-entbase/server/func_tracktrain.qc | 30 +++-- .../server/func_tracktraincontrols.qc | 6 +- src/gs-entbase/server/func_train.qc | 33 ++--- src/gs-entbase/server/func_wall_toggle.qc | 14 +- src/gs-entbase/server/game_counter.qc | 20 +-- src/gs-entbase/server/game_counter_set.qc | 14 +- src/gs-entbase/server/game_player_equip.qc | 16 ++- src/gs-entbase/server/game_text.qc | 12 +- src/gs-entbase/server/gibshooter.qc | 3 +- src/gs-entbase/server/info_hint.qc | 12 +- src/gs-entbase/server/info_intermission.qc | 3 +- src/gs-entbase/server/info_node.qc | 6 +- src/gs-entbase/server/info_node_air.qc | 6 +- src/gs-entbase/server/info_notnull.qc | 3 +- src/gs-entbase/server/info_null.qc | 10 +- src/gs-entbase/server/infodecal.qc | 16 ++- src/gs-entbase/server/item_food.qc | 2 +- src/gs-entbase/server/light.qc | 20 +-- src/gs-entbase/server/logic_auto.qc | 20 +-- src/gs-entbase/server/momentary_door.qc | 19 +-- src/gs-entbase/server/momentary_rot_button.qc | 26 ++-- src/gs-entbase/server/momentarybase.qc | 1 + src/gs-entbase/server/monster_furniture.qc | 6 +- src/gs-entbase/server/monster_generic.qc | 6 +- src/gs-entbase/server/monstermaker.qc | 22 +-- src/gs-entbase/server/multi_manager.qc | 4 +- src/gs-entbase/server/multisource.qc | 12 +- src/gs-entbase/server/path_corner.qc | 14 +- src/gs-entbase/server/player_loadsaved.qc | 16 ++- src/gs-entbase/server/player_weaponstrip.qc | 7 +- src/gs-entbase/server/point_camera.qc | 15 ++- src/gs-entbase/server/prop_door_rotating.qc | 1 + src/gs-entbase/server/prop_dynamic.qc | 9 +- src/gs-entbase/server/prop_physics.qc | 9 +- src/gs-entbase/server/prop_static.qc | 6 +- src/gs-entbase/server/random_speaker.qc | 22 +-- src/gs-entbase/server/random_trigger.qc | 14 +- src/gs-entbase/server/scripted_sentence.qc | 14 +- src/gs-entbase/server/scripted_sequence.qc | 24 ++-- src/gs-entbase/server/speaker.qc | 18 +-- src/gs-entbase/server/targ_speaker.qc | 14 +- src/gs-entbase/server/target_cdaudio.qc | 14 +- src/gs-entbase/server/trigger_auto.qc | 18 +-- src/gs-entbase/server/trigger_autosave.qc | 15 ++- src/gs-entbase/server/trigger_cdaudio.qc | 16 ++- src/gs-entbase/server/trigger_changelevel.qc | 25 ++-- src/gs-entbase/server/trigger_changetarget.qc | 12 +- src/gs-entbase/server/trigger_counter.qc | 16 ++- src/gs-entbase/server/trigger_endsection.qc | 8 +- src/gs-entbase/server/trigger_hurt.qc | 24 ++-- src/gs-entbase/server/trigger_look.qc | 20 +-- src/gs-entbase/server/trigger_multiple.qc | 24 ++-- src/gs-entbase/server/trigger_once.qc | 22 +-- src/gs-entbase/server/trigger_playerfreeze.qc | 11 +- src/gs-entbase/server/trigger_push.qc | 22 +-- src/gs-entbase/server/trigger_teleport.qc | 9 +- src/gs-entbase/server/trigger_transition.qc | 6 +- src/gs-entbase/shared/ambient_generic.qc | 31 +++-- src/gs-entbase/shared/env_bubbles.qc | 1 + src/gs-entbase/shared/env_fog_controller.qc | 59 ++++---- src/gs-entbase/shared/env_projectedtexture.qc | 20 +-- src/gs-entbase/shared/env_sprite.qc | 15 ++- src/gs-entbase/shared/func_friction.qc | 12 +- src/gs-entbase/shared/func_illusionary.qc | 17 +-- src/gs-entbase/shared/func_ladder.qc | 10 +- src/gs-entbase/shared/func_monitor.qc | 21 +-- src/gs-entbase/shared/func_tankmortar.qc | 32 ++--- src/gs-entbase/shared/func_vehicle.qc | 20 +-- src/gs-entbase/shared/func_wall.qc | 11 +- src/gs-entbase/shared/info_particle_system.qc | 27 ++-- src/gs-entbase/shared/light_dynamic.qc | 26 ++-- .../shared/prop_physics_multiplayer.qc | 13 +- src/gs-entbase/shared/prop_rope.qc | 17 +-- .../shared/prop_vehicle_driveable.qc | 62 +++++---- src/gs-entbase/shared/trigger_camera.qc | 19 +-- src/gs-entbase/shared/trigger_gravity.qc | 17 +-- src/gs-entbase/shared/worldspawn.qc | 8 +- src/server/defs.h | 1 - src/server/entry.qc | 2 - src/server/footsteps.h | 17 --- src/server/footsteps.qc | 27 ---- src/server/include.src | 2 - src/server/server.qc | 1 - src/shared/NSClientPlayer.h | 127 +++++++++--------- src/shared/NSMonster.qc | 4 - src/shared/NSRenderableEntity.h | 4 +- src/shared/NSRenderableEntity.qc | 9 -- src/shared/NSSurfacePropEntity.qc | 3 - src/shared/NSTalkMonster.qc | 4 - 149 files changed, 1232 insertions(+), 1140 deletions(-) mode change 100644 => 100755 build_engine.sh delete mode 100644 src/gs-entbase/client/env_sprite.qc delete mode 100644 src/server/footsteps.h delete mode 100644 src/server/footsteps.qc delete mode 100644 src/server/server.qc diff --git a/Documentation/Main.md b/Documentation/Main.md index 7985f2ec..72a0357f 100644 --- a/Documentation/Main.md +++ b/Documentation/Main.md @@ -14,7 +14,7 @@ as to have a stable base with a decent API for making games. - Client-side predicted movement and inputs for things like weapons-systems - Lots of well documented objects to use in level formats supported by FTEQW - Reference implementations for a lot of features exlusive to FTEQW compared - to other idTech engines + to other id Tech engines - Designed to be familar to developers who're used to GoldSrc and Source engine projects diff --git a/Documentation/Materials/MatOverview.md b/Documentation/Materials/MatOverview.md index 3d536e17..a66bdb52 100644 --- a/Documentation/Materials/MatOverview.md +++ b/Documentation/Materials/MatOverview.md @@ -4,7 +4,7 @@ ## History -In the idTech series of engines, **id Tech 3/Quake III Arena** was the first to introduce such a system, wrongly referred to back then as **shaders**. This was before vertex and fragment shaders were commonplace in the video-game asset pipeline. +In the id Tech series of engines, **id Tech 3/Quake III Arena** was the first to introduce such a system, wrongly referred to back then as **shaders**. This was before vertex and fragment shaders were commonplace in the video-game asset pipeline. ![from pulsing tubes to various animated materials in Quake III Arena](q3a_material.jpg) diff --git a/Documentation/Models/VVM_Tutorial.md b/Documentation/Models/VVM_Tutorial.md index 05b7687e..eace3b48 100644 --- a/Documentation/Models/VVM_Tutorial.md +++ b/Documentation/Models/VVM_Tutorial.md @@ -15,7 +15,7 @@ Any .vvm consists of multiple input files. These can come in the following formats: - SMD (GoldSrc & Source) -- MD5MESH and MD5ANIM (idTech 4) +- MD5MESH and MD5ANIM (id Tech 4) - FBX - IQE - OBJ (no animations) diff --git a/Documentation/Sound/SoundDefs.md b/Documentation/Sound/SoundDefs.md index e09d4988..e9eab303 100644 --- a/Documentation/Sound/SoundDefs.md +++ b/Documentation/Sound/SoundDefs.md @@ -1,9 +1,9 @@ # Sound: soundDef -Nuclide mimics the sound defintion spec from **idTech 4** somewhat, albeit +Nuclide mimics the sound defintion spec from **id Tech 4** somewhat, albeit with some changes/enhancements. We call them **soundDefs**. **The elevator pitch**: To allow for more control over the sounds than what was previously -allowed in idTech engines we also allow designers to drop sounds into +allowed in id Tech engines we also allow designers to drop sounds into the game without having to set some common parameters every time. Instead of directly calling which .wav or .ogg file to play, we tell it @@ -79,7 +79,7 @@ This one has multiple sound files specified, which means that **Nuclide** will r ## Power to the developer {#power_to_the_developer} -Unlike the implementation in **idTech 4**, all of the sound defs handling +Unlike the implementation in **id Tech 4**, all of the sound defs handling is done in the game-logic and is therefore exposed to all developers. Some mods may want to hook AI callbacks into the system, or create visual effects when commands are called by a sound def. The diff --git a/README.md b/README.md index 43e20b04..176e1e82 100644 --- a/README.md +++ b/README.md @@ -7,95 +7,17 @@ It's been used to ship a commercial product. So it's proven to some extent. All of this is written in QuakeC, but there's also some GLSL and shell scripts in here. If you and our team is unfamilar with any of these, you may want something else. -You can integrate an engine (FTE) and level design tool (WorldSpawn) directly from this tree. *See the 'Building' section for details.* -They're the projects actually based on idTech (GPL) code and therefore are in their own repositories. -If you're unfamilar with any of these, you may want something else. +## Documentation -**All the code here is ISC-Licensed.** +You can find up-to-date documentation over at https://developer.vera-visions.com/ -It's provided here under the terms of that license. You can have it - do what you like with it. Please don't barge in and demand help, support or hand-holding assistance unless you're going to offer us a good rate ($$$) for it. This is all provided AS-IS. It works for plenty of people, but might not for you! - -## Features -* Reference codebase for first-person shooters in FTEQW, from scratch -* Has support for 100+ entities found in games such as Quake, Half-Life and Source SDK -* Support for player movement prediction and weapon prediction, for smooth online play -* AI system that's designed to be extendable for both singleplayer and multiplayer (BotLib) -* Waypoint editor -* UI toolkits for both 2D and in-world 3D drawing, like you'd see in Doom III -* Plugins system so that modders can write external plugins that hook into virtually every game -* Plenty of example projects available - -## Building -The 'build_engine.sh' script checks out the **FTE Subversion** repository and keeps it up to date, -while also building binaries that are crucial to running and building the game-logic -(which is all QuakeC, to re-iterate) and putting them into the ./bin directory. -Launch the engine with the 'nuclide' and 'nuclide-ds' scripts. - -On Windows, please use cygwin, MSYS2 or something for a sensible experience. If that doesn't work you can always resort to WSL. We have no plans on supporting Windows natively, as we don't do development on Windows. - -The 'build_editor.sh' script clones the **WorldSpawn** Git repository and installs them into the ./bin directory. -Use the 'worldspawn' and 'vmap' scripts to launch to ensure consistency. - -The 'build_game.sh' script will build the game-logic for the games included -using the QuakeC compiler present in the ./bin directory. -If the compiler isn't found it will ask you to build them. If you are running an operating system that has 'fteqcc' in its repositories, it may very well be out of date. - -For best results, symlink the desired scripts into your home directory's bin folder. -The scripts are designed to be aware of their actual location in the filesystem. - -## Packages -This is a development environment/framework. There are will be no binary packages. - -## Dependencies - -Rough list of dependencies for the average Linux system. -On some systems the names may slightly differ. These should be correct for OpenSUSE. - -### Engine -* subversion -* gmake -* gcc -* mesa-libGL-devel -* libgnutls-devel -* libopenal-devel -* libX11-devel -* libXcursor-devel -* libXrandr-devel -* libSDL2-devel (only if you pass BUILD_SDL2=1 to build_engine.sh) - -For WinNT and Darwin systems it's recommended you use the SDL2 backend, but native backends -may be available in FTEQW. - -The X development packages are obviously only a requirement for when you do not compile an SDL2 build on a UNIX-like system. - -Slackware users generally don't need to install anything, unless they explicitly diasable BUILD_ENGINE_DEPENDENCIES inside build.cfg. - -### FFMPEG Plugin -* ffmpeg-4-libavformat-devel -* ffmpeg-4-libswscale-devel - -You want this plugin if you want playback of a variety of media formats, including video decoding. -Building it can be disabled by editing build.cfg. - -### Worldspawn Level Editor -* gcc-c++ -* gtk2-devel -* gtkglext-devel -* libxml2-devel -* libjpeg8-devel -* minizip-devel - -This is the only component that requires a C++ compiler. -Same as with Nuclide, don't bother us with support. It works for us but it may not work for you. -We cannot help you get other editors working for you. Generally you can use any .bsp format FTEQW supports anyway, so your choice of editor does not matter at all. - -## Support -Join us in #nuclide on irc.libera.chat and chat if you're interested in using this in production. -**All this is provided to you for free and as-is otherwise.** +This documentation is built entirely from this repository using doxygen. +You do not need to be on-line to view the documentation. ## Special Thanks + To id software and specifically John Carmack for having released the sources of -various idTech games under the GPL2 license, without which we would have no engine for Nuclide. +various pieces of id Technology under free licenses. David Walton for **FTEQW** and the **FTEQCC** compiler, which is the brain of this SDK. diff --git a/build_engine.sh b/build_engine.sh old mode 100644 new mode 100755 diff --git a/make_mapdef.sh b/make_mapdef.sh index 775c28a3..541622ed 100755 --- a/make_mapdef.sh +++ b/make_mapdef.sh @@ -10,8 +10,9 @@ ent_for_mod() ENT_OUTFILE="./$1/entities.def" echo '' > "$ENT_OUTFILE" + echo "Scanning for definitions inside the game directory." find ./$1/src/ -type f \( -iname \*.qc \) | while read EDEF_N; do - echo "Scanning for definitions inside $EDEF_N" + echo "... $EDEF_N" sed -n '/\/*QUAKED/,/*\//p' $EDEF_N >> "$ENT_OUTFILE" done; @@ -22,8 +23,9 @@ ent_for_mod() BASE_ENT="./platform/entities.def" echo '' > "$BASE_ENT" +echo "Scanning for definitions inside the general entity codebase." find ./src/gs-entbase/ -type f \( -iname \*.qc \) | while read EDEF_N; do - echo "Scanning for definitions inside $EDEF_N" + echo "... $EDEF_N" sed -n '/\/*QUAKED/,/*\//p' $EDEF_N >> "$BASE_ENT" done; diff --git a/src/gs-entbase/client/env_cubemap.qc b/src/gs-entbase/client/env_cubemap.qc index bda7cea4..303347e0 100644 --- a/src/gs-entbase/client/env_cubemap.qc +++ b/src/gs-entbase/client/env_cubemap.qc @@ -36,10 +36,12 @@ void CMap_Shoot(void); class env_cubemap:NSEntity { - int m_iSize; +public: + void env_cubemap(void); + virtual void SpawnKey(string,string); - void(void) env_cubemap; - virtual void(string, string) SpawnKey; +private: + int m_iSize; }; void diff --git a/src/gs-entbase/client/env_glow.qc b/src/gs-entbase/client/env_glow.qc index ac016592..edcaa7c5 100644 --- a/src/gs-entbase/client/env_glow.qc +++ b/src/gs-entbase/client/env_glow.qc @@ -33,6 +33,17 @@ var int autocvar_r_skipLensFlares = 0; class env_glow:NSEntity /* change to renderablentity? */ { +public: + void env_glow(void); + + virtual void Spawned(void); + virtual void Respawn(void); + virtual float predraw(void); + virtual void postdraw(void); + virtual void SpawnKey(string,string); + virtual void RendererRestarted(void); + +private: vector m_vecColor; float m_flAlpha; float m_flMaxAlpha; @@ -42,15 +53,6 @@ class env_glow:NSEntity /* change to renderablentity? */ vector m_vecRotate; vector m_vecOrientation; - - void(void) env_glow; - - virtual void(void) Spawned; - virtual void(void) Respawn; - virtual float(void) predraw; - virtual void(void) postdraw; - virtual void(string, string) SpawnKey; - virtual void(void) RendererRestarted; }; void env_sun_lensflare(vector, float, vector); diff --git a/src/gs-entbase/client/env_laser.qc b/src/gs-entbase/client/env_laser.qc index 9a76ad44..8bffe6d3 100644 --- a/src/gs-entbase/client/env_laser.qc +++ b/src/gs-entbase/client/env_laser.qc @@ -27,14 +27,16 @@ enumflags class env_laser { +public: + void env_laser(void); + + virtual void ReceiveEntity(float,float); + virtual float predraw(void); + +private: int m_iState; string m_strBeamTex; string m_strEndTex; - - void(void) env_laser; - - virtual void(float,float) ReceiveEntity; - virtual float(void) predraw; }; float env_laser::predraw(void) diff --git a/src/gs-entbase/client/env_particle.qc b/src/gs-entbase/client/env_particle.qc index 5a74518d..76fa94ee 100644 --- a/src/gs-entbase/client/env_particle.qc +++ b/src/gs-entbase/client/env_particle.qc @@ -31,6 +31,14 @@ This entity was introduced in The Wastes (2018). class env_particle:NSEntity { +public: + void env_particle(void); + + virtual void Respawn(void); + virtual void customphysics(void); + virtual void SpawnKey(string,string); + +private: entity m_eTarget; float m_flNextTime; float m_flPartID; @@ -38,12 +46,6 @@ class env_particle:NSEntity float m_flWait; int m_iCount; string m_strTarget; - - void(void) env_particle; - - virtual void(void) Respawn; - virtual void(void) customphysics; - virtual void(string, string) SpawnKey; }; void env_particle::customphysics(void) diff --git a/src/gs-entbase/client/env_sound.qc b/src/gs-entbase/client/env_sound.qc index 4ff29230..57085a0a 100644 --- a/src/gs-entbase/client/env_sound.qc +++ b/src/gs-entbase/client/env_sound.qc @@ -66,13 +66,15 @@ string g_hlefx[] = { class env_sound:NSEntity { +public: + void env_sound(void); + + virtual void Respawn(void); + virtual void SpawnKey(string,string); + +private: int m_iRoomType; int m_iRadius; - - void(void) env_sound; - - virtual void(void) Respawn; - virtual void(string, string) SpawnKey; }; void diff --git a/src/gs-entbase/client/env_soundscape.qc b/src/gs-entbase/client/env_soundscape.qc index 3c1e8618..2a9800f8 100644 --- a/src/gs-entbase/client/env_soundscape.qc +++ b/src/gs-entbase/client/env_soundscape.qc @@ -31,15 +31,17 @@ int g_scapes; class env_soundscape:NSEntity { +public: + void env_soundscape(void); + + virtual void Respawn(void); + virtual void SpawnKey(string,string); + +private: int m_iID; int m_iShader; int m_iRadius; float m_flVolume; - - void(void) env_soundscape; - - virtual void(void) Respawn; - virtual void(string, string) SpawnKey; }; env_soundscape g_entSoundScape; diff --git a/src/gs-entbase/client/env_sprite.qc b/src/gs-entbase/client/env_sprite.qc deleted file mode 100644 index e69de29b..00000000 diff --git a/src/gs-entbase/client/env_sun.qc b/src/gs-entbase/client/env_sun.qc index b8ec6604..b933ccf6 100644 --- a/src/gs-entbase/client/env_sun.qc +++ b/src/gs-entbase/client/env_sun.qc @@ -46,17 +46,19 @@ Util_IsSky(vector pos) class env_sun:NSEntity { +public: + void env_sun(void); + + virtual void Spawned(void); + virtual void postdraw(void); + virtual float predraw(void); + virtual void SpawnKey(string,string); + virtual void RendererRestarted(void); + +private: vector m_vecLensPos; float m_flLensAlpha; int m_iUseAngles; - - void(void) env_sun; - - virtual void(void) Spawned; - virtual void(void) postdraw; - virtual float(void) predraw; - virtual void(string, string) SpawnKey; - virtual void(void) RendererRestarted; }; void diff --git a/src/gs-entbase/client/func_dustcloud.qc b/src/gs-entbase/client/func_dustcloud.qc index 38c4659d..2c5f548a 100644 --- a/src/gs-entbase/client/func_dustcloud.qc +++ b/src/gs-entbase/client/func_dustcloud.qc @@ -29,6 +29,13 @@ This entity was introduced in Half-Life 2 (2004). class func_dustcloud:NSEntity { +public: + void func_dustcloud(void); + virtual void Spawned(void); + virtual float predraw(void); + virtual void SpawnKey(string,string); + +private: int m_iCount; int m_iPart; float m_flNexTime; @@ -39,16 +46,17 @@ class func_dustcloud:NSEntity vector m_vecColor; float m_flLifetimeMin; float m_flLifetimeMax; - - void(void) func_dustcloud; - virtual void(void) Spawned; - virtual float() predraw; - virtual void(string, string) SpawnKey; }; #if 1 class func_dustcloud_cloud { +public: + void func_dustcloud_cloud(void); + + virtual float predraw(void); + +private: vector cloudsize; float lifetime; @@ -56,10 +64,6 @@ class func_dustcloud_cloud float m_flMaxAlpha; vector m_vecColor; float m_flLifeTime; - - void(void) func_dustcloud_cloud; - - virtual float(void) predraw; }; float diff --git a/src/gs-entbase/client/func_dustmotes.qc b/src/gs-entbase/client/func_dustmotes.qc index c09e5733..ec43a224 100644 --- a/src/gs-entbase/client/func_dustmotes.qc +++ b/src/gs-entbase/client/func_dustmotes.qc @@ -26,15 +26,17 @@ This entity was introduced in Half-Life 2 (2004). class func_dustmotes:NSEntity { +public: + void func_dustmotes(void); + + virtual void Spawned(void); + virtual float predraw(void); + virtual void SpawnKey(string,string); + +private: int m_iCount; int m_iPart; float m_flNexTime; - - void(void) func_dustmotes; - - virtual void(void) Spawned; - virtual float() predraw; - virtual void(string, string) SpawnKey; }; float diff --git a/src/gs-entbase/client/func_lod.qc b/src/gs-entbase/client/func_lod.qc index 123b753c..d804215c 100644 --- a/src/gs-entbase/client/func_lod.qc +++ b/src/gs-entbase/client/func_lod.qc @@ -33,13 +33,15 @@ var int autocvar_dev_loddistance = 0; class func_lod:NSRenderableEntity { +public: + void func_lod(void); + + virtual void Spawned(void); + virtual float predraw(void); + virtual void SpawnKey(string,string); + +private: int m_iDisappearDist; - - void(void) func_lod; - - virtual void(void) Spawned; - virtual float() predraw; - virtual void(string,string) SpawnKey; }; float diff --git a/src/gs-entbase/client/func_smokevolume.qc b/src/gs-entbase/client/func_smokevolume.qc index 79367b7e..99855170 100644 --- a/src/gs-entbase/client/func_smokevolume.qc +++ b/src/gs-entbase/client/func_smokevolume.qc @@ -30,6 +30,14 @@ This entity was introduced in Half-Life 2 (2004). class func_smokevolume:NSEntity { +public: + void func_smokevolume(void); + + virtual void Spawned(void); + virtual float predraw(void); + virtual void SpawnKey(string, string); + +private: int m_iCount; int m_iPart; float m_flNexTime; @@ -43,16 +51,17 @@ class func_smokevolume:NSEntity float m_flLifetimeMax; string m_strMaterial; float m_flMaxDrawDistance; - - void(void) func_smokevolume; - virtual void(void) Spawned; - virtual float() predraw; - virtual void(string, string) SpawnKey; }; #if 1 class func_smokevolume_cloud { +public: + void func_smokevolume_cloud(void); + + virtual float predraw(void); + +private: vector cloudsize; float lifetime; @@ -61,10 +70,6 @@ class func_smokevolume_cloud vector m_vecColor; float m_flLifeTime; string m_strMaterial; - - void(void) func_smokevolume_cloud; - - virtual float(void) predraw; }; float diff --git a/src/gs-entbase/client/info_notnull.qc b/src/gs-entbase/client/info_notnull.qc index ad8b5692..1dd2eb0e 100644 --- a/src/gs-entbase/client/info_notnull.qc +++ b/src/gs-entbase/client/info_notnull.qc @@ -16,7 +16,8 @@ class info_notnull:NSEntity { - void(void) info_notnull; +public: + void info_notnull(void); }; void diff --git a/src/gs-entbase/client/infodecal.qc b/src/gs-entbase/client/infodecal.qc index 18989892..782e2118 100644 --- a/src/gs-entbase/client/infodecal.qc +++ b/src/gs-entbase/client/infodecal.qc @@ -17,12 +17,14 @@ class infodecal:NSEntity { +public: + void infodecal(void); + virtual void SpawnKey(string, string); + virtual float predraw(void); + +private: decal m_decChild; string m_strTexture; - - void(void) infodecal; - virtual void(string, string) SpawnKey; - virtual float(void) predraw; }; float diff --git a/src/gs-entbase/client/light_environment.qc b/src/gs-entbase/client/light_environment.qc index 0fedfc79..6d25e112 100644 --- a/src/gs-entbase/client/light_environment.qc +++ b/src/gs-entbase/client/light_environment.qc @@ -51,10 +51,12 @@ This entity was introduced in Half-Life (1998). class light_environment:NSEntity { - void(void) light_environment; +public: + void light_environment(void); + + virtual void Respawn(void); + virtual void SpawnKey(string,string); - virtual void(void) Respawn; - virtual void(string, string) SpawnKey; }; void diff --git a/src/gs-entbase/client/point_message.qc b/src/gs-entbase/client/point_message.qc index 80ab490c..5ca6be69 100644 --- a/src/gs-entbase/client/point_message.qc +++ b/src/gs-entbase/client/point_message.qc @@ -31,12 +31,13 @@ This entity was introduced in Half-Life 2 (2004). class point_message:NSEntity { +public: + void point_message(void); + virtual void SpawnKey(string, string); + +private: float m_flRadius; string m_strMessage; - - void(void) point_message; - - virtual void(string, string) SpawnKey; }; void diff --git a/src/gs-entbase/client/prop_static.qc b/src/gs-entbase/client/prop_static.qc index 07a115e9..33a240d1 100644 --- a/src/gs-entbase/client/prop_static.qc +++ b/src/gs-entbase/client/prop_static.qc @@ -17,13 +17,15 @@ class prop_static:NSEntity { +public: + void prop_static(void); + + virtual void SpawnKey(string,string); + virtual void Respawn(void); + virtual void Spawned(void); + +private: int m_iBody; - - void(void) prop_static; - - virtual void(string, string) SpawnKey; - virtual void(void) Respawn; - virtual void(void) Spawned; }; void diff --git a/src/gs-entbase/client/sky_camera.qc b/src/gs-entbase/client/sky_camera.qc index fde07e22..f99c6218 100644 --- a/src/gs-entbase/client/sky_camera.qc +++ b/src/gs-entbase/client/sky_camera.qc @@ -36,9 +36,10 @@ var int g_skyscale; class sky_camera:NSEntity { - void(void) sky_camera; +public: + void sky_camera(void); - virtual void(string, string) SpawnKey; + virtual void SpawnKey(string, string); }; void diff --git a/src/gs-entbase/server/button_target.qc b/src/gs-entbase/server/button_target.qc index b1da6a13..ed1f9676 100644 --- a/src/gs-entbase/server/button_target.qc +++ b/src/gs-entbase/server/button_target.qc @@ -41,11 +41,12 @@ class button_target:NSSurfacePropEntity { public: - void(void) button_target; + void button_target(void); + + virtual void Respawn(void); + virtual void Trigger(entity,int); + virtual void Damage(void); - virtual void(void) Respawn; - virtual void(entity, int) Trigger; - virtual void(void) Damage; }; void diff --git a/src/gs-entbase/server/cycler.qc b/src/gs-entbase/server/cycler.qc index e68be214..b57ee8aa 100644 --- a/src/gs-entbase/server/cycler.qc +++ b/src/gs-entbase/server/cycler.qc @@ -36,10 +36,12 @@ This entity was introduced in Half-Life (1998). class cycler:NSSurfacePropEntity { - void(void) cycler; +public: + void cycler(void); + + virtual void Respawn(void); + virtual void Pain(void); - virtual void(void) Respawn; - virtual void(void) Pain; }; void diff --git a/src/gs-entbase/server/env_beam.qc b/src/gs-entbase/server/env_beam.qc index 4428c174..ede539da 100644 --- a/src/gs-entbase/server/env_beam.qc +++ b/src/gs-entbase/server/env_beam.qc @@ -27,7 +27,8 @@ This entity was introduced in Half-Life (1998). class env_beam { - void(void) env_beam; +public: + void env_beam(void); }; void diff --git a/src/gs-entbase/server/env_beverage.qc b/src/gs-entbase/server/env_beverage.qc index 3cc382ea..6c04baef 100644 --- a/src/gs-entbase/server/env_beverage.qc +++ b/src/gs-entbase/server/env_beverage.qc @@ -63,13 +63,15 @@ env_beverage:NSRenderableEntity bool m_bReady; sodaskin_t m_sodaSkin; - void(void) env_beverage; +public: + void env_beverage(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Spawned(void); + virtual void Trigger(entity,int); - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Spawned; - virtual void(entity, int) Trigger; }; void diff --git a/src/gs-entbase/server/env_explosion.qc b/src/gs-entbase/server/env_explosion.qc index f22cb8c1..645caa80 100644 --- a/src/gs-entbase/server/env_explosion.qc +++ b/src/gs-entbase/server/env_explosion.qc @@ -52,14 +52,16 @@ env_explosion:NSPointTrigger float m_flMaxDelay; bool m_bEnabled; - void(void) env_explosion; - +public: + void env_explosion(void); + /* overrides */ - virtual void(float) Save; - virtual void(string,string) Restore; - virtual void(entity, int) Trigger; - virtual void(string, string) SpawnKey; - virtual void(void) Respawn; + virtual void Save(float); + virtual void Restore(string,string); + virtual void Trigger(entity,int); + virtual void SpawnKey(string,string); + virtual void Respawn(void); + }; void diff --git a/src/gs-entbase/server/env_fade.qc b/src/gs-entbase/server/env_fade.qc index 7417c368..9fc8daa6 100644 --- a/src/gs-entbase/server/env_fade.qc +++ b/src/gs-entbase/server/env_fade.qc @@ -48,13 +48,14 @@ env_fade:NSRenderableEntity float m_flFadeDuration; float m_flFadeHold; - void(void) env_fade; - +public: + void env_fade(void); + /* overrides */ - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(entity, int) Trigger; - virtual void(string, string) SpawnKey; + virtual void Save(float); + virtual void Restore(string,string); + virtual void Trigger(entity,int); + virtual void SpawnKey(string,string); }; void diff --git a/src/gs-entbase/server/env_global.qc b/src/gs-entbase/server/env_global.qc index 6b8f5ef8..a75fabfa 100644 --- a/src/gs-entbase/server/env_global.qc +++ b/src/gs-entbase/server/env_global.qc @@ -40,18 +40,20 @@ env_global:NSPointTrigger int m_iTriggerMode; int m_iInitialState; - void(void) env_global; - - /* overrides */ - virtual void(float) Save; - virtual void(string,string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Spawned; - virtual void(entity, int) Trigger; +public: + void env_global(void); - virtual int(string) GlobalPresent; - virtual void(string, globalstate_t) AddNewGlobal; - virtual void(string, globalstate_t) SetGlobal; + /* overrides */ + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Spawned(void); + virtual void Trigger(entity,int); + + virtual int GlobalPresent(string); + virtual void AddNewGlobal(string,globalstate_t); + virtual void SetGlobal(string,globalstate_t); + }; void diff --git a/src/gs-entbase/server/env_hudhint.qc b/src/gs-entbase/server/env_hudhint.qc index 8510ec0b..68781fec 100644 --- a/src/gs-entbase/server/env_hudhint.qc +++ b/src/gs-entbase/server/env_hudhint.qc @@ -45,12 +45,14 @@ env_hudhint:NSPointTrigger { string m_strMessage; - void(void) env_hudhint; +public: + void env_hudhint(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Trigger(entity,int); - virtual void(float) Save; - virtual void(string,string) Restore; - virtual void(string, string) SpawnKey; - virtual void(entity, int) Trigger; }; void diff --git a/src/gs-entbase/server/env_laser.qc b/src/gs-entbase/server/env_laser.qc index 9a2757c4..23c6f1d6 100644 --- a/src/gs-entbase/server/env_laser.qc +++ b/src/gs-entbase/server/env_laser.qc @@ -63,16 +63,18 @@ env_laser:NSPointTrigger string m_strBeamTex; string m_strEndTex; - void(void) env_laser; +public: + void env_laser(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Respawn(void); + virtual void LaserThink(void); + virtual void Trigger(entity,int); + virtual void EvaluateEntity(void); + virtual float SendEntity(entity,float); - virtual void(float) Save; - virtual void(string,string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Respawn; - virtual void(void) LaserThink; - virtual void(entity, int) Trigger; - virtual void(void) EvaluateEntity; - virtual float(entity, float) SendEntity; }; void diff --git a/src/gs-entbase/server/env_message.qc b/src/gs-entbase/server/env_message.qc index 8869e614..3dd2cb96 100644 --- a/src/gs-entbase/server/env_message.qc +++ b/src/gs-entbase/server/env_message.qc @@ -47,14 +47,16 @@ env_message:NSPointTrigger float m_flVolume; int m_iAttenuation; /* FIXME: change this to a proper attenuation type */ - void(void) env_message; +public: + void env_message(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Respawn(void); + + virtual void Play(entity,int); - virtual void(float) Save; - virtual void(string,string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Respawn; - - virtual void(entity, int) Play; }; void diff --git a/src/gs-entbase/server/env_render.qc b/src/gs-entbase/server/env_render.qc index 45674fa5..3b4987e7 100644 --- a/src/gs-entbase/server/env_render.qc +++ b/src/gs-entbase/server/env_render.qc @@ -43,7 +43,6 @@ Supported Render-Mode ("rendermode") values: 4 : Solid; Make transparent by respecting transparent pixels (GoldSrc) 5 : Additive; Blend the object additively against the world. 6 : Fullbright; Render the object without lighting. -7 : Trigger; Will only show when the console variable cl_showtriggers is set to 1. Supported Render-FX ("renderfx") values: 0 : Normal @@ -79,9 +78,11 @@ enumflags class env_render:NSRenderableEntity { - void(void) env_render; +public: + void env_render(void); + + virtual void Trigger(entity,int); - virtual void(entity, int) Trigger; }; void diff --git a/src/gs-entbase/server/env_shake.qc b/src/gs-entbase/server/env_shake.qc index 3990d943..97bd4be5 100644 --- a/src/gs-entbase/server/env_shake.qc +++ b/src/gs-entbase/server/env_shake.qc @@ -43,12 +43,14 @@ env_shake:NSPointTrigger float m_flDuration; float m_flFrequency; - void(void) env_shake; +public: + void env_shake(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Trigger(entity,int); - virtual void(float) Save; - virtual void(string,string) Restore; - virtual void(string, string) SpawnKey; - virtual void(entity act, int) Trigger; }; void diff --git a/src/gs-entbase/server/env_shooter.qc b/src/gs-entbase/server/env_shooter.qc index e0b776ee..1f191d24 100644 --- a/src/gs-entbase/server/env_shooter.qc +++ b/src/gs-entbase/server/env_shooter.qc @@ -51,15 +51,17 @@ env_shooter:NSPointTrigger float m_flShootSounds; float m_flScale; float m_flSkin; - - void(void) env_shooter; - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Respawn; - virtual void(void) ShootGib; - virtual void(entity, int) Trigger; +public: + void env_shooter(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Respawn(void); + virtual void ShootGib(void); + virtual void Trigger(entity,int); + }; void diff --git a/src/gs-entbase/server/env_spark.qc b/src/gs-entbase/server/env_spark.qc index c4beae64..d630d9f7 100644 --- a/src/gs-entbase/server/env_spark.qc +++ b/src/gs-entbase/server/env_spark.qc @@ -52,16 +52,18 @@ env_spark:NSPointTrigger { float m_flMaxDelay; - void(void) env_spark; +public: + void env_spark(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 Trigger(entity,int); + virtual void CreateSpark(void); + virtual void TimedSpark(void); - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Spawned; - virtual void(void) Respawn; - virtual void(entity, int) Trigger; - virtual void(void) CreateSpark; - virtual void(void) TimedSpark; }; void diff --git a/src/gs-entbase/server/func_areaportal.qc b/src/gs-entbase/server/func_areaportal.qc index 3f18d578..0b05522b 100644 --- a/src/gs-entbase/server/func_areaportal.qc +++ b/src/gs-entbase/server/func_areaportal.qc @@ -37,16 +37,18 @@ func_areaportal:NSEntity int m_iPortalState; int m_iStartOpen; - void(void) func_areaportal; - +public: + void func_areaportal(void); + /* overrides */ - virtual void(void) Respawn; - virtual void(string, string) SpawnKey; - virtual void(entity, int) Trigger; - virtual void(entity, string, string) Input; + virtual void Respawn(void); + virtual void SpawnKey(string,string); + virtual void Trigger(entity,int); + virtual void Input(entity,string,string); + + virtual void PortalOpen(void); + virtual void PortalClose(void); - virtual void(void) PortalOpen; - virtual void(void) PortalClose; }; void diff --git a/src/gs-entbase/server/func_breakable.qc b/src/gs-entbase/server/func_breakable.qc index 74f9bcc3..53ed5aa3 100644 --- a/src/gs-entbase/server/func_breakable.qc +++ b/src/gs-entbase/server/func_breakable.qc @@ -128,21 +128,22 @@ func_breakable:NSSurfacePropEntity int m_pressType; int m_pressDamage;*/ - - void(void) func_breakable; - +public: + void func_breakable(void); + /* overrides */ - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Spawned; - virtual void(void) Respawn; - virtual void(void) Pain; - virtual void(void) Death; - virtual void(entity, int) Trigger; + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Spawned(void); + virtual void Respawn(void); + virtual void Pain(void); + virtual void Death(void); + virtual void Trigger(entity,int); + + virtual void Explode(void); + virtual void Touch(entity); - virtual void(void) Explode; - virtual void(entity) Touch; /*virtual void(void) PressureDeath;*/ }; diff --git a/src/gs-entbase/server/func_brush.qc b/src/gs-entbase/server/func_brush.qc index 98a7f231..0d9392c5 100644 --- a/src/gs-entbase/server/func_brush.qc +++ b/src/gs-entbase/server/func_brush.qc @@ -44,13 +44,15 @@ func_brush:NSRenderableEntity int m_iSolidity; int m_iStartOff; - void(void) func_brush; +public: + void func_brush(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void Respawn(void); + virtual void Trigger(entity,int); + virtual void SpawnKey(string,string); - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(void) Respawn; - virtual void(entity,int) Trigger; - virtual void(string,string) SpawnKey; }; void diff --git a/src/gs-entbase/server/func_button.qc b/src/gs-entbase/server/func_button.qc index 6db9ecf8..bbb01aaf 100644 --- a/src/gs-entbase/server/func_button.qc +++ b/src/gs-entbase/server/func_button.qc @@ -103,25 +103,25 @@ func_button:NSSurfacePropEntity string m_strOnIn; string m_strOnOut; +public: void func_button(void); - - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Spawned; - virtual void(void) Respawn; - virtual void(void) Arrived; - virtual void(void) Returned; - virtual void(void) MoveBack; - virtual void(void) MoveAway; - virtual void(entity) Touch; - virtual void(entity) Blocked; - virtual void(entity, int) Trigger; - virtual void(void) DeathTrigger; - virtual void(void) PlayerUse; - virtual void(void) SetMovementDirection; - virtual void(vector, void(void)) MoveToDestination; + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Spawned(void); + virtual void Respawn(void); + virtual void Arrived(void); + virtual void Returned(void); + virtual void MoveBack(void); + virtual void MoveAway(void); + virtual void Touch(entity); + virtual void Blocked(entity); + virtual void Trigger(entity,int); + virtual void DeathTrigger(void); + virtual void PlayerUse(void); + virtual void SetMovementDirection(void); + virtual void MoveToDestination(vector, void(void)); }; void diff --git a/src/gs-entbase/server/func_conveyor.qc b/src/gs-entbase/server/func_conveyor.qc index cd6f0029..0afd4066 100644 --- a/src/gs-entbase/server/func_conveyor.qc +++ b/src/gs-entbase/server/func_conveyor.qc @@ -35,16 +35,18 @@ func_conveyor:NSRenderableEntity float m_flSpeed; vector m_vecMoveDir; +public: void(void) func_conveyor; - virtual void(float) Save; - virtual void(string,string) Restore; - virtual void(void) Respawn; - virtual void(entity, int) Trigger; - virtual void(entity) Touch; - virtual void(void) SetMovementDirection; - virtual void(entity, string, string) Input; - virtual void(string, string) SpawnKey; + virtual void Save(float); + virtual void Restore(string,string); + virtual void Respawn(void); + virtual void Trigger(entity,int); + virtual void Touch(entity); + virtual void SetMovementDirection(void); + virtual void Input(entity, string, string); + virtual void SpawnKey(string,string); + }; void diff --git a/src/gs-entbase/server/func_door.qc b/src/gs-entbase/server/func_door.qc index 18181d61..4693636a 100644 --- a/src/gs-entbase/server/func_door.qc +++ b/src/gs-entbase/server/func_door.qc @@ -100,6 +100,7 @@ func_door:NSRenderableEntity string m_strSndMove; string m_strSndStop; +public: void(void) func_door; virtual void Spawned(void); diff --git a/src/gs-entbase/server/func_door_rotating.qc b/src/gs-entbase/server/func_door_rotating.qc index e93306df..1f42cc37 100644 --- a/src/gs-entbase/server/func_door_rotating.qc +++ b/src/gs-entbase/server/func_door_rotating.qc @@ -91,28 +91,29 @@ func_door_rotating:NSRenderableEntity vector m_vecMoveDir; bool m_iCanTouch; - void(void) func_door_rotating; - - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(void) Spawned; - virtual void(void) PortalOpen; - virtual void(void) PortalClose; - virtual void(void) Respawn; - virtual void(void) Arrived; - virtual void(void) Returned; - virtual void(void) Back; - virtual void(void) Away; - virtual void(entity, int) Trigger; - virtual void(void) Use; - virtual void(entity) Touch; - virtual void(entity) Blocked; - virtual void(void) SetMovementDirection; - virtual void(vector angle, void(void) func) RotToDest; - virtual void(string, string) SpawnKey; +public: + void func_door_rotating(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void Spawned(void); + virtual void PortalOpen(void); + virtual void PortalClose(void); + virtual void Respawn(void); + virtual void Arrived(void); + virtual void Returned(void); + virtual void Back(void); + virtual void Away(void); + virtual void Trigger(entity,int); + virtual void Use(void); + virtual void Touch(entity); + virtual void Blocked(entity); + virtual void SetMovementDirection(void); + virtual void SpawnKey(string,string); + virtual void RotToDest(vector angle, void(void) func); #ifdef GS_PHYSICS - virtual void(void) Unhinge; + virtual void Unhinge(void); #endif }; diff --git a/src/gs-entbase/server/func_guntarget.qc b/src/gs-entbase/server/func_guntarget.qc index 10f75b9c..cff25c49 100644 --- a/src/gs-entbase/server/func_guntarget.qc +++ b/src/gs-entbase/server/func_guntarget.qc @@ -37,22 +37,25 @@ func_guntarget:NSSurfacePropEntity string m_strOnDeath; string m_strOnDeathLegacy; - void(void) func_guntarget; +public: + void func_guntarget(void); /* overrides */ - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Spawned; - virtual void(void) Respawn; - virtual void(entity act, int) Trigger; - virtual void(void) Death; - virtual void(entity, string, string) Input; + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Spawned(void); + virtual void Respawn(void); + virtual void Trigger(entity,int); + virtual void Death(void); + + virtual void NextPath(void); + virtual void Move(void); + virtual void Start(void); + virtual void Stop(void); + + virtual void Input(entity, string, string); - virtual void(void) NextPath; - virtual void(void) Move; - virtual void(void) Start; - virtual void(void) Stop; }; void diff --git a/src/gs-entbase/server/func_healthcharger.qc b/src/gs-entbase/server/func_healthcharger.qc index 3e2096d9..dd4fd582 100644 --- a/src/gs-entbase/server/func_healthcharger.qc +++ b/src/gs-entbase/server/func_healthcharger.qc @@ -40,18 +40,20 @@ func_healthcharger:NSRenderableEntity string m_strSndCharging; string m_strSndDone; - void(void) func_healthcharger; - +public: + void func_healthcharger(void); + /* overrides */ - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(void) Spawned; - virtual void(string, string) SpawnKey; - virtual void(void) customphysics; - virtual void(void) Respawn; + virtual void Save(float); + virtual void Restore(string,string); + virtual void Spawned(void); + virtual void SpawnKey(string,string); + virtual void customphysics(void); + virtual void Respawn(void); + + virtual void OnPlayerUse(void); + virtual void ResetHealth(void); - virtual void(void) OnPlayerUse; - virtual void(void) ResetHealth; }; void diff --git a/src/gs-entbase/server/func_lod.qc b/src/gs-entbase/server/func_lod.qc index dcacb3a8..632f76c3 100644 --- a/src/gs-entbase/server/func_lod.qc +++ b/src/gs-entbase/server/func_lod.qc @@ -17,11 +17,13 @@ class func_lod:NSEntity { - void(void) func_lod; +public: + void func_lod(void); + + virtual void Respawn(void); + virtual void SpawnKey(string,string); + virtual float SendEntity(entity,float); - virtual void(void) Respawn; - virtual void(string, string) SpawnKey; - virtual float(entity, float) SendEntity; }; void diff --git a/src/gs-entbase/server/func_mortar_field.qc b/src/gs-entbase/server/func_mortar_field.qc index efc52dbb..3f054e27 100644 --- a/src/gs-entbase/server/func_mortar_field.qc +++ b/src/gs-entbase/server/func_mortar_field.qc @@ -51,19 +51,20 @@ func_mortar_field:NSBrushTrigger string m_strXController; string m_strYController; - void(void) func_mortar_field; - +public: + void func_mortar_field(void); + /* overrides */ - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(entity,int) Trigger; - virtual void(void) Respawn; - virtual void(string, string) SpawnKey; - - virtual void(vector) Fire; - virtual void(void) FireRandom; - virtual void(entity) FireTarget; - virtual void(void) FireControlled; + virtual void Save(float); + virtual void Restore(string,string); + virtual void Trigger(entity,int); + virtual void Respawn(void); + virtual void SpawnKey(string,string); + + virtual void Fire(vector); + virtual void FireRandom(void); + virtual void FireTarget(entity); + virtual void FireControlled(void); }; void diff --git a/src/gs-entbase/server/func_pendulum.qc b/src/gs-entbase/server/func_pendulum.qc index 7484fb15..42a59891 100644 --- a/src/gs-entbase/server/func_pendulum.qc +++ b/src/gs-entbase/server/func_pendulum.qc @@ -57,14 +57,16 @@ func_pendulum:NSRenderableEntity float m_flDampening; float m_flDistance; - void(void) func_pendulum; +public: + void func_pendulum(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Respawn(void); + virtual void Trigger(entity,int); + virtual void customphysics(void); - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Respawn; - virtual void(entity, int) Trigger; - virtual void(void) customphysics; }; void diff --git a/src/gs-entbase/server/func_physbox.qc b/src/gs-entbase/server/func_physbox.qc index 13b706c3..60b6bed1 100644 --- a/src/gs-entbase/server/func_physbox.qc +++ b/src/gs-entbase/server/func_physbox.qc @@ -30,10 +30,12 @@ This entity was introduced in Half-Life 2 (2004). class func_physbox:NSPhysicsEntity { +public: void func_physbox(void); virtual void Respawn(void); virtual void SpawnKey(string, string); + }; void diff --git a/src/gs-entbase/server/func_plat.qc b/src/gs-entbase/server/func_plat.qc index 7cbd17e1..e005811f 100644 --- a/src/gs-entbase/server/func_plat.qc +++ b/src/gs-entbase/server/func_plat.qc @@ -46,18 +46,20 @@ func_plat:NSRenderableEntity float m_flSpeed; float m_flHeight; - void(void) func_plat; +public: + void func_plat(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void Trigger(entity,int); + virtual void Respawn(void); + virtual void Touch(entity); + virtual void SpawnKey(string,string); - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(entity, int) Trigger; - virtual void(void) ArrivedUp; - virtual void(void) ArrivedDown; - virtual void(vector, void(void)) Move; - virtual void(void) MoveToggle; - virtual void(void) Respawn; - virtual void(entity) Touch; - virtual void(string, string) SpawnKey; + virtual void ArrivedUp(void); + virtual void ArrivedDown(void); + virtual void MoveToggle(void); + virtual void Move(vector, void(void)); }; void diff --git a/src/gs-entbase/server/func_platrot.qc b/src/gs-entbase/server/func_platrot.qc index 6aa3e97c..43c27a79 100644 --- a/src/gs-entbase/server/func_platrot.qc +++ b/src/gs-entbase/server/func_platrot.qc @@ -54,18 +54,20 @@ func_platrot:NSRenderableEntity string m_strNoise2; float m_flRotation; - void(void) func_platrot; +public: + void func_platrot(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void Trigger(entity,int); + virtual void Respawn(void); + virtual void Touch(entity); + virtual void SpawnKey(string,string); - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(entity, int) Trigger; - virtual void(void) ArrivedUp; - virtual void(void) ArrivedDown; - virtual void(vector, vector, void(void)) Move; - virtual void(void) MoveToggle; - virtual void(void) Respawn; - virtual void(entity) Touch; - virtual void(string, string) SpawnKey; + virtual void Move(vector, vector, void(void)); + virtual void ArrivedUp(void); + virtual void ArrivedDown(void); + virtual void MoveToggle(void); }; void diff --git a/src/gs-entbase/server/func_pushable.qc b/src/gs-entbase/server/func_pushable.qc index 60a10e8c..3e6850bc 100644 --- a/src/gs-entbase/server/func_pushable.qc +++ b/src/gs-entbase/server/func_pushable.qc @@ -37,15 +37,17 @@ func_pushable:func_breakable entity m_pPuller; entity m_eCollBox; - void(void) func_pushable; +public: + void func_pushable(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void customphysics(void); + virtual void Respawn(void); + virtual void Touch(entity); + virtual void OnPlayerUse(void); + virtual void OnRemoveEntity(void); - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(void) customphysics; - virtual void(void) Respawn; - virtual void(entity) Touch; - virtual void(void) OnPlayerUse; - virtual void(void) OnRemoveEntity; }; void diff --git a/src/gs-entbase/server/func_recharge.qc b/src/gs-entbase/server/func_recharge.qc index 5b2b637b..940f281e 100644 --- a/src/gs-entbase/server/func_recharge.qc +++ b/src/gs-entbase/server/func_recharge.qc @@ -40,18 +40,19 @@ func_recharge:NSRenderableEntity string m_strSndCharging; string m_strSndDone; - void(void) func_recharge; - + void func_recharge(void); + /* overrides */ - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Spawned; - virtual void(void) Respawn; - virtual void(void) customphysics; + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Spawned(void); + virtual void Respawn(void); + virtual void customphysics(void); + + virtual void OnPlayerUse(void); + virtual void ResetHealth(void); - virtual void(void) OnPlayerUse; - virtual void(void) ResetHealth; }; void diff --git a/src/gs-entbase/server/func_rot_button.qc b/src/gs-entbase/server/func_rot_button.qc index dbf225b7..e7fc38df 100644 --- a/src/gs-entbase/server/func_rot_button.qc +++ b/src/gs-entbase/server/func_rot_button.qc @@ -70,22 +70,24 @@ func_rot_button:NSSurfacePropEntity float m_flDistance; float m_flReturnTime; - void(void) func_rot_button; - +public: + void func_rot_button(void); + /* overrides */ - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Respawn; - virtual void(entity) Touch; - virtual void(void) Death; + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Respawn(void); + virtual void Touch(entity); + virtual void Death(void); + + virtual void ArrivedClosed(void); + virtual void ArrivedOpened(void); + virtual void TriggerTargets(void); + virtual void Rotate(vector, void()); + virtual void TurnToggle(void); + virtual void OnPlayerUse(void); - virtual void(void) ArrivedClosed; - virtual void(void) ArrivedOpened; - virtual void(void) TriggerTargets; - virtual void(vector, void()) Rotate; - virtual void(void) TurnToggle; - virtual void(void) OnPlayerUse; }; void diff --git a/src/gs-entbase/server/func_rotating.qc b/src/gs-entbase/server/func_rotating.qc index cdc86379..4d88c312 100644 --- a/src/gs-entbase/server/func_rotating.qc +++ b/src/gs-entbase/server/func_rotating.qc @@ -71,19 +71,21 @@ func_rotating:NSRenderableEntity float m_flDamage; float m_flDir; - void(void) func_rotating; - +public: + void func_rotating(void); + /* overrides */ - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Respawn; - virtual void(entity, int) Trigger; + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Respawn(void); + virtual void Trigger(entity,int); + + virtual void Rotate(void); + virtual void Blocked(entity); + virtual void Touch(entity); + virtual void SetMovementDirection(void); - virtual void(void) Rotate; - virtual void(entity) Blocked; - virtual void(entity) Touch; - virtual void(void) SetMovementDirection; }; void diff --git a/src/gs-entbase/server/func_tank.qc b/src/gs-entbase/server/func_tank.qc index ace31210..f8e18e10 100644 --- a/src/gs-entbase/server/func_tank.qc +++ b/src/gs-entbase/server/func_tank.qc @@ -88,17 +88,19 @@ func_tank:NSVehicle float m_flFireTime; - void(void) func_tank; +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 SpriteSmoke(vector); + virtual void SpriteFlash(vector); + virtual void SpawnKey(string,string); - virtual void(void) Spawned; - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(void) customphysics; - virtual void(void) PlayerInput; - virtual void(void) Respawn; - virtual void(vector) SpriteSmoke; - virtual void(vector) SpriteFlash; - virtual void(string, string) SpawnKey; }; void diff --git a/src/gs-entbase/server/func_tankcontrols.qc b/src/gs-entbase/server/func_tankcontrols.qc index 2f70a797..ee593fbb 100644 --- a/src/gs-entbase/server/func_tankcontrols.qc +++ b/src/gs-entbase/server/func_tankcontrols.qc @@ -28,10 +28,12 @@ This entity was introduced in Half-Life (1998). class func_tankcontrols:NSBrushTrigger { - void(void) func_tankcontrols; +public: + void func_tankcontrols(void); + + virtual void OnPlayerUse(void); + virtual void Respawn(void); - virtual void(void) OnPlayerUse; - virtual void(void) Respawn; }; void diff --git a/src/gs-entbase/server/func_tracktrain.qc b/src/gs-entbase/server/func_tracktrain.qc index 119f6dd6..8e2220ca 100644 --- a/src/gs-entbase/server/func_tracktrain.qc +++ b/src/gs-entbase/server/func_tracktrain.qc @@ -62,22 +62,24 @@ func_tracktrain:NSRenderableEntity string m_strMoveSnd; string m_strStopSnd; - void(void) func_tracktrain; +public: + void func_tracktrain(void); - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Spawned; - virtual void(void) Respawn; - virtual void(entity, int) Trigger; + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Spawned(void); + virtual void Respawn(void); + virtual void Trigger(entity,int); + + virtual void SoundMove(void); + virtual void SoundStop(void); + virtual void AfterSpawn(void); + virtual void PathNext(void); + virtual void PathMove(void); + virtual void PathDone(void); + virtual void Blocked(entity); - virtual void(void) SoundMove; - virtual void(void) SoundStop; - virtual void(void) AfterSpawn; - virtual void(void) PathNext; - virtual void(void) PathMove; - virtual void(void) PathDone; - virtual void(entity) Blocked; }; void diff --git a/src/gs-entbase/server/func_tracktraincontrols.qc b/src/gs-entbase/server/func_tracktraincontrols.qc index a9f85c59..ca81e050 100644 --- a/src/gs-entbase/server/func_tracktraincontrols.qc +++ b/src/gs-entbase/server/func_tracktraincontrols.qc @@ -29,9 +29,11 @@ This entity was introduced in Half-Life (1998). class func_traincontrols:NSBrushTrigger { - void(void) func_traincontrols; +public: + void func_traincontrols(void); + + virtual void Respawn(void); - virtual void(void) Respawn; }; void diff --git a/src/gs-entbase/server/func_train.qc b/src/gs-entbase/server/func_train.qc index ff9345fe..28538d41 100644 --- a/src/gs-entbase/server/func_train.qc +++ b/src/gs-entbase/server/func_train.qc @@ -63,23 +63,24 @@ func_train:NSRenderableEntity string m_strMoveSnd; string m_strStopSnd; - void(void) func_train; - +public: + void func_train(void); + /* overrides */ - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Spawned; - virtual void(void) Respawn; - virtual void(entity, int) Trigger; - - virtual void(void) SoundMove; - virtual void(void) SoundStop; - virtual void(void) AfterSpawn; - virtual void(void) PathNext; - virtual void(void) PathMove; - virtual void(void) PathDone; - virtual void(entity) Blocked; + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Spawned(void); + virtual void Respawn(void); + virtual void Trigger(entity,int); + + virtual void SoundMove(void); + virtual void SoundStop(void); + virtual void AfterSpawn(void); + virtual void PathNext(void); + virtual void PathMove(void); + virtual void PathDone(void); + virtual void Blocked(entity); }; void diff --git a/src/gs-entbase/server/func_wall_toggle.qc b/src/gs-entbase/server/func_wall_toggle.qc index f67803fd..a9310aa0 100644 --- a/src/gs-entbase/server/func_wall_toggle.qc +++ b/src/gs-entbase/server/func_wall_toggle.qc @@ -38,13 +38,15 @@ func_wall_toggle:NSRenderableEntity int m_oldmodelindex; int m_iVisible; - void(void) func_wall_toggle; +public: + void func_wall_toggle(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void Respawn(void); + virtual void Trigger(entity,int); + virtual void Input(entity,string,string); - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(void) Respawn; - virtual void(entity, int) Trigger; - virtual void(entity, string, string) Input; }; void diff --git a/src/gs-entbase/server/game_counter.qc b/src/gs-entbase/server/game_counter.qc index f64a0980..b34e4f7b 100644 --- a/src/gs-entbase/server/game_counter.qc +++ b/src/gs-entbase/server/game_counter.qc @@ -47,17 +47,19 @@ game_counter:NSPointTrigger int m_iCounted; int m_iMaxCount; - void(void) game_counter; - +public: + void game_counter(void); + /* overrides */ - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(entity,int) Trigger; - virtual void(void) Respawn; - virtual void(string, string) SpawnKey; + virtual void Save(float); + virtual void Restore(string,string); + virtual void Trigger(entity,int); + virtual void Respawn(void); + virtual void SpawnKey(string,string); + + virtual int GetCount(void); + virtual void SetCount(int); - virtual int(void) GetCount; - virtual void(int) SetCount; }; void diff --git a/src/gs-entbase/server/game_counter_set.qc b/src/gs-entbase/server/game_counter_set.qc index d360f23f..71a126bc 100644 --- a/src/gs-entbase/server/game_counter_set.qc +++ b/src/gs-entbase/server/game_counter_set.qc @@ -41,13 +41,15 @@ game_counter_set:NSPointTrigger { int m_iCount; - void(void) game_counter_set; +public: + void game_counter_set(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void Trigger(entity,int); + virtual void Respawn(void); + virtual void SpawnKey(string,string); - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(entity,int) Trigger; - virtual void(void) Respawn; - virtual void(string, string) SpawnKey; }; void diff --git a/src/gs-entbase/server/game_player_equip.qc b/src/gs-entbase/server/game_player_equip.qc index 7c82021e..85bd24b7 100644 --- a/src/gs-entbase/server/game_player_equip.qc +++ b/src/gs-entbase/server/game_player_equip.qc @@ -48,14 +48,16 @@ game_player_equip:NSPointTrigger { string m_strBuffer; - void(void) game_player_equip; +public: + void game_player_equip(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void Trigger(entity,int); + virtual void SpawnKey(string,string); + + virtual void SpawnUnit(string,vector); - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(entity, int) Trigger; - virtual void(string, string) SpawnKey; - - virtual void(string, vector) SpawnUnit; }; void diff --git a/src/gs-entbase/server/game_text.qc b/src/gs-entbase/server/game_text.qc index 0cac2580..c947af10 100644 --- a/src/gs-entbase/server/game_text.qc +++ b/src/gs-entbase/server/game_text.qc @@ -60,12 +60,14 @@ game_text:NSPointTrigger int m_iChannel; int m_iEffect; - void(void) game_text; +public: + void game_text(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Trigger(entity,int); - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(entity, int) Trigger; }; void diff --git a/src/gs-entbase/server/gibshooter.qc b/src/gs-entbase/server/gibshooter.qc index be5ee779..167443a2 100644 --- a/src/gs-entbase/server/gibshooter.qc +++ b/src/gs-entbase/server/gibshooter.qc @@ -38,7 +38,8 @@ This entity was introduced in Half-Life (1998). class gibshooter:env_shooter { - void(void) gibshooter; +public: + void gibshooter(void); }; void diff --git a/src/gs-entbase/server/info_hint.qc b/src/gs-entbase/server/info_hint.qc index d8a7054c..84e76dd9 100644 --- a/src/gs-entbase/server/info_hint.qc +++ b/src/gs-entbase/server/info_hint.qc @@ -149,12 +149,14 @@ info_hint:NSPointTrigger aistate_t m_minState; aistate_t m_maxState; - void(void) info_hint; - +public: + void info_hint(void); + /* overrides */ - virtual void(float) Save; - virtual void(string,string) Restore; - virtual void(string, string) SpawnKey; + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + }; void diff --git a/src/gs-entbase/server/info_intermission.qc b/src/gs-entbase/server/info_intermission.qc index d24e6a66..dc2f75f1 100644 --- a/src/gs-entbase/server/info_intermission.qc +++ b/src/gs-entbase/server/info_intermission.qc @@ -34,7 +34,8 @@ This entity was introduced in Quake (1996). class info_intermission:NSPointTrigger { - void(void) info_intermission; +public: + void info_intermission(void); }; void diff --git a/src/gs-entbase/server/info_node.qc b/src/gs-entbase/server/info_node.qc index 0ed82fdb..a400fa41 100644 --- a/src/gs-entbase/server/info_node.qc +++ b/src/gs-entbase/server/info_node.qc @@ -27,9 +27,11 @@ This entity was introduced in Half-Life (1998). class info_node:NSPointTrigger { - void(void) info_node; +public: + void info_node(void); + + virtual void Respawn(void); - virtual void(void) Respawn; }; void diff --git a/src/gs-entbase/server/info_node_air.qc b/src/gs-entbase/server/info_node_air.qc index 5d4e2a5f..9add1d9e 100644 --- a/src/gs-entbase/server/info_node_air.qc +++ b/src/gs-entbase/server/info_node_air.qc @@ -27,9 +27,11 @@ This entity was introduced in Half-Life (1998). class info_node_air:NSPointTrigger { - void(void) info_node_air; +public: + void info_node_air(void); + + virtual void Respawn(void); - virtual void(void) Respawn; }; void diff --git a/src/gs-entbase/server/info_notnull.qc b/src/gs-entbase/server/info_notnull.qc index a565060d..3c025968 100644 --- a/src/gs-entbase/server/info_notnull.qc +++ b/src/gs-entbase/server/info_notnull.qc @@ -35,7 +35,8 @@ This entity was introduced in Quake (1996). class info_notnull:NSPointTrigger { - void(void) info_notnull; +public: + void info_notnull(void); }; void diff --git a/src/gs-entbase/server/info_null.qc b/src/gs-entbase/server/info_null.qc index 631837d7..211cba76 100644 --- a/src/gs-entbase/server/info_null.qc +++ b/src/gs-entbase/server/info_null.qc @@ -32,12 +32,14 @@ This entity was introduced in Quake (1996). class info_null:NSPointTrigger { - void(void) info_null; - +public: + void info_null(void); + #ifdef DEBUG_INFONULL - virtual void(void) WarnDeveloper; - virtual void(void) Respawn; + virtual void WarnDeveloper(void); + virtual void Respawn(void); #endif + }; void diff --git a/src/gs-entbase/server/infodecal.qc b/src/gs-entbase/server/infodecal.qc index eb191fff..ac8b0a9c 100644 --- a/src/gs-entbase/server/infodecal.qc +++ b/src/gs-entbase/server/infodecal.qc @@ -42,14 +42,16 @@ infodecal:NSPointTrigger decal m_decChild; string m_strTexture; - void(void) infodecal; +public: + void infodecal(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Respawn(void); + virtual void Spawned(void); + virtual void Trigger(entity,int); - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Respawn; - virtual void(void) Spawned; - virtual void(entity, int) Trigger; }; void diff --git a/src/gs-entbase/server/item_food.qc b/src/gs-entbase/server/item_food.qc index a012c6a4..3c2787e6 100644 --- a/src/gs-entbase/server/item_food.qc +++ b/src/gs-entbase/server/item_food.qc @@ -31,7 +31,7 @@ item_food:NSEntity { int m_iIsCan; - void(void) item_food; + void item_food(void); virtual void Spawned(void); virtual void Save(float); diff --git a/src/gs-entbase/server/light.qc b/src/gs-entbase/server/light.qc index 091cac9c..24fc66ed 100644 --- a/src/gs-entbase/server/light.qc +++ b/src/gs-entbase/server/light.qc @@ -106,16 +106,18 @@ light:NSPointTrigger float m_flSwitchStyle; string m_strPattern; - void(void) light; - +public: + void light(void); + /* overrides */ - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Spawned; - virtual void(void) Respawn; - virtual void(void) RestoreComplete; - virtual void(entity, int) Trigger; + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Spawned(void); + virtual void Respawn(void); + virtual void RestoreComplete(void); + virtual void Trigger(entity,int); + }; void diff --git a/src/gs-entbase/server/logic_auto.qc b/src/gs-entbase/server/logic_auto.qc index 9051d3dc..fe5201bb 100644 --- a/src/gs-entbase/server/logic_auto.qc +++ b/src/gs-entbase/server/logic_auto.qc @@ -62,17 +62,19 @@ logic_auto:NSPointTrigger /* temporary */ int m_iFromSaveGame; - void(void) logic_auto; - +public: + void logic_auto(void); + /* overrides */ - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Spawned; - virtual void(void) Respawn; - virtual void(void) RestoreComplete; + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Spawned(void); + virtual void Respawn(void); + virtual void RestoreComplete(void); + + virtual void Processing(void); - virtual void(void) Processing; }; void diff --git a/src/gs-entbase/server/momentary_door.qc b/src/gs-entbase/server/momentary_door.qc index ed5c9c82..35de7a0a 100644 --- a/src/gs-entbase/server/momentary_door.qc +++ b/src/gs-entbase/server/momentary_door.qc @@ -27,15 +27,16 @@ This entity was introduced in Half-Life (1998). class momentary_door:NSMomentary { - void(void) momentary_door; - - virtual void(string, string) SpawnKey; - virtual void(void) Respawn; - virtual void(void) SetMovementDirection; - - virtual void(void) MovementDone; - virtual void(void) MovementStateChanged; - virtual float(void) GetProgress; +public: + void momentary_door(void); + + virtual void SpawnKey(string,string); + virtual void Respawn(void); + virtual void SetMovementDirection(void); + + virtual void MovementDone(void); + virtual void MovementStateChanged(void); + virtual float GetProgress(void); }; void diff --git a/src/gs-entbase/server/momentary_rot_button.qc b/src/gs-entbase/server/momentary_rot_button.qc index 613a1f31..74dcc4c4 100644 --- a/src/gs-entbase/server/momentary_rot_button.qc +++ b/src/gs-entbase/server/momentary_rot_button.qc @@ -52,20 +52,22 @@ momentary_rot_button:NSMomentary { int m_iTurnDir; - void(void) momentary_rot_button; - +public: + void momentary_rot_button(void); + /* overrides */ - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(void) OnPlayerUse; - virtual void(void) OnPlayerUnUse; - virtual void(void) Respawn; - virtual void(void) SetMovementDirection; - virtual void(string, string) SpawnKey; + virtual void Save(float); + virtual void Restore(string,string); + virtual void OnPlayerUse(void); + virtual void OnPlayerUnUse(void); + virtual void Respawn(void); + virtual void SetMovementDirection(void); + virtual void SpawnKey(string,string); + + virtual void MovementDone(void); + virtual void MovementStateChanged(void); + virtual float GetProgress(void); - virtual void(void) MovementDone; - virtual void(void) MovementStateChanged; - virtual float(void) GetProgress; }; void diff --git a/src/gs-entbase/server/momentarybase.qc b/src/gs-entbase/server/momentarybase.qc index b3014cbe..e419eb0c 100644 --- a/src/gs-entbase/server/momentarybase.qc +++ b/src/gs-entbase/server/momentarybase.qc @@ -53,6 +53,7 @@ public: virtual void MovementStateChanged(void); /** Returns the progress of the momentary, which is a value between 0.0 and 1.0. */ virtual float GetProgress(void); + }; void diff --git a/src/gs-entbase/server/monster_furniture.qc b/src/gs-entbase/server/monster_furniture.qc index e6f6f927..afaf80c3 100644 --- a/src/gs-entbase/server/monster_furniture.qc +++ b/src/gs-entbase/server/monster_furniture.qc @@ -41,9 +41,11 @@ enumflags class monster_furniture:NSMonster { - void(void) monster_furniture; +public: + void monster_furniture(void); + + virtual void Respawn(void); - virtual void(void) Respawn; }; void diff --git a/src/gs-entbase/server/monster_generic.qc b/src/gs-entbase/server/monster_generic.qc index c219d204..938ce8c9 100644 --- a/src/gs-entbase/server/monster_generic.qc +++ b/src/gs-entbase/server/monster_generic.qc @@ -34,9 +34,11 @@ This entity was introduced in Half-Life (1998). class monster_generic:NSTalkMonster { - void(void) monster_generic; +public: + void monster_generic(void); + + virtual void Respawn(void); - virtual void(void) Respawn; }; void diff --git a/src/gs-entbase/server/monstermaker.qc b/src/gs-entbase/server/monstermaker.qc index 1a8556aa..dc299f66 100644 --- a/src/gs-entbase/server/monstermaker.qc +++ b/src/gs-entbase/server/monstermaker.qc @@ -55,18 +55,20 @@ monstermaker:NSPointTrigger int m_iMaxChildren; float m_flDelay; - void(void) monstermaker; - +public: + void monstermaker(void); + /* overrides */ - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Respawn; - virtual void(entity, int) Trigger; + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Respawn(void); + virtual void Trigger(entity,int); + + virtual void Spawner(void); + virtual void TurnOn(void); + virtual void TurnOff(void); - virtual void(void) Spawner; - virtual void(void) TurnOn; - virtual void(void) TurnOff; }; void diff --git a/src/gs-entbase/server/multi_manager.qc b/src/gs-entbase/server/multi_manager.qc index 867db08d..5088c2bf 100644 --- a/src/gs-entbase/server/multi_manager.qc +++ b/src/gs-entbase/server/multi_manager.qc @@ -39,11 +39,13 @@ multi_manager_sub:NSPointTrigger int m_iValue; float m_flUntilTriggered; - void(void) multi_manager_sub; +public: + void multi_manager_sub(void); /* overrides */ virtual void Save(float); virtual void Restore(string,string); + }; void diff --git a/src/gs-entbase/server/multisource.qc b/src/gs-entbase/server/multisource.qc index 8355c08d..747f09c8 100644 --- a/src/gs-entbase/server/multisource.qc +++ b/src/gs-entbase/server/multisource.qc @@ -32,12 +32,14 @@ This entity was introduced in Half-Life (1998). class multisource:NSPointTrigger { - void(void) multisource; +public: + void multisource(void); + + virtual void Respawn(void); + virtual int QueryTargets(void); + virtual int GetValue(void); + virtual void Trigger(entity,int); - virtual void(void) Respawn; - virtual int(void) QueryTargets; - virtual int(void) GetValue; - virtual void(entity, int) Trigger; }; void diff --git a/src/gs-entbase/server/path_corner.qc b/src/gs-entbase/server/path_corner.qc index 294f186f..2c05c17c 100644 --- a/src/gs-entbase/server/path_corner.qc +++ b/src/gs-entbase/server/path_corner.qc @@ -53,13 +53,15 @@ path_corner:NSPointTrigger float m_flYawSpeed; float m_flWait; - void(void) path_corner; +public: + void path_corner(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Respawn(void); + virtual void Trigger(entity,int); - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Respawn; - virtual void(entity, int) Trigger; }; void diff --git a/src/gs-entbase/server/player_loadsaved.qc b/src/gs-entbase/server/player_loadsaved.qc index ddb22e14..93ad93aa 100644 --- a/src/gs-entbase/server/player_loadsaved.qc +++ b/src/gs-entbase/server/player_loadsaved.qc @@ -40,15 +40,17 @@ player_loadsaved:NSRenderableEntity /* for the rendercolor values */ float m_flFadeDuration; float m_flFadeHold; - void(void) player_loadsaved; - +public: + void player_loadsaved(void); + /* overrides */ - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(entity, int) Trigger; + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Trigger(entity,int); + + virtual void ReloadSave(void); - virtual void(void) ReloadSave; }; void diff --git a/src/gs-entbase/server/player_weaponstrip.qc b/src/gs-entbase/server/player_weaponstrip.qc index 24145758..f36eb152 100644 --- a/src/gs-entbase/server/player_weaponstrip.qc +++ b/src/gs-entbase/server/player_weaponstrip.qc @@ -27,9 +27,10 @@ This entity was introduced in Half-Life (1998). class player_weaponstrip:NSPointTrigger { - void(void) player_weaponstrip; - - virtual void(entity, int) Trigger; +public: + void player_weaponstrip(void); + + virtual void Trigger(entity,int); }; void diff --git a/src/gs-entbase/server/point_camera.qc b/src/gs-entbase/server/point_camera.qc index fef55558..1e6de1d8 100644 --- a/src/gs-entbase/server/point_camera.qc +++ b/src/gs-entbase/server/point_camera.qc @@ -50,14 +50,15 @@ point_camera:NSPointTrigger float m_flFogEnd; float m_flFOV; - void(void) point_camera; - +public: + void point_camera(void); + /* overrides */ - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string,string) SpawnKey; - virtual void(void) Respawn; - virtual void(entity,string,string) Input; + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Respawn(void); + virtual void Input(entity,string,string); }; void diff --git a/src/gs-entbase/server/prop_door_rotating.qc b/src/gs-entbase/server/prop_door_rotating.qc index 54526dcc..18714f35 100644 --- a/src/gs-entbase/server/prop_door_rotating.qc +++ b/src/gs-entbase/server/prop_door_rotating.qc @@ -29,6 +29,7 @@ prop_door_rotating:NSPointTrigger float m_flDistance; float m_flSpeed; +public: void prop_door_rotating(void); /* overrides */ diff --git a/src/gs-entbase/server/prop_dynamic.qc b/src/gs-entbase/server/prop_dynamic.qc index 16b7146a..3aa755d9 100644 --- a/src/gs-entbase/server/prop_dynamic.qc +++ b/src/gs-entbase/server/prop_dynamic.qc @@ -33,10 +33,11 @@ This entity was introduced in Half-Life 2 (2004). class prop_dynamic:NSSurfacePropEntity { - void(void) prop_dynamic; - - virtual void(string, string) SpawnKey; - virtual void(void) Respawn; +public: + void prop_dynamic(void); + + virtual void SpawnKey(string,string); + virtual void Respawn(void); }; void diff --git a/src/gs-entbase/server/prop_physics.qc b/src/gs-entbase/server/prop_physics.qc index 53032118..f657aab6 100644 --- a/src/gs-entbase/server/prop_physics.qc +++ b/src/gs-entbase/server/prop_physics.qc @@ -30,10 +30,11 @@ This entity was introduced in Half-Life 2 (2004). class prop_physics:NSPhysicsEntity { - void(void) prop_physics; - - virtual void(string, string) SpawnKey; - virtual void(void) Respawn; +public: + void prop_physics(void); + + virtual void SpawnKey(string,string); + virtual void Respawn(void); }; void diff --git a/src/gs-entbase/server/prop_static.qc b/src/gs-entbase/server/prop_static.qc index 777eb523..f72ef5dc 100644 --- a/src/gs-entbase/server/prop_static.qc +++ b/src/gs-entbase/server/prop_static.qc @@ -41,9 +41,11 @@ This entity was introduced in Half-Life 2 (2004). class prop_static:NSRenderableEntity { - void(void) prop_static; +public: + void prop_static(void); + + virtual void Respawn(void); - virtual void(void) Respawn; }; void diff --git a/src/gs-entbase/server/random_speaker.qc b/src/gs-entbase/server/random_speaker.qc index 3fd3ddc8..c09a3af4 100644 --- a/src/gs-entbase/server/random_speaker.qc +++ b/src/gs-entbase/server/random_speaker.qc @@ -46,18 +46,20 @@ random_speaker:NSPointTrigger float m_flMinPos; float m_flRandPercent; - void(void) random_speaker; - +public: + void random_speaker(void); + /* overrides */ - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Respawn; - virtual void(entity,int) Trigger; + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Respawn(void); + virtual void Trigger(entity,int); + + virtual void PlaySample(void); + virtual void Enable(void); + virtual void Disable(void); - virtual void(void) PlaySample; - virtual void(void) Enable; - virtual void(void) Disable; }; void diff --git a/src/gs-entbase/server/random_trigger.qc b/src/gs-entbase/server/random_trigger.qc index 89cca542..9df6dcbd 100644 --- a/src/gs-entbase/server/random_trigger.qc +++ b/src/gs-entbase/server/random_trigger.qc @@ -39,13 +39,15 @@ random_trigger:NSPointTrigger float m_flRandMax; int m_iStartState; - void(void) random_trigger; +public: + void random_trigger(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Respawn(void); + virtual void Trigger(entity,int); - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Respawn; - virtual void(entity,int) Trigger; }; void diff --git a/src/gs-entbase/server/scripted_sentence.qc b/src/gs-entbase/server/scripted_sentence.qc index f8fdc6d6..592f6d6c 100644 --- a/src/gs-entbase/server/scripted_sentence.qc +++ b/src/gs-entbase/server/scripted_sentence.qc @@ -42,13 +42,15 @@ scripted_sentence:NSPointTrigger float m_flPitch; float m_flDuration; - void(void) scripted_sentence; - +public: + void scripted_sentence(void); + /* overrides */ - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(entity, int) Trigger; + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Trigger(entity,int); + }; void diff --git a/src/gs-entbase/server/scripted_sequence.qc b/src/gs-entbase/server/scripted_sequence.qc index 19939233..6cde1c1d 100644 --- a/src/gs-entbase/server/scripted_sequence.qc +++ b/src/gs-entbase/server/scripted_sequence.qc @@ -103,18 +103,20 @@ scripted_sequence:NSPointTrigger /* How we move to perform m_iActionAnim */ int m_iMove; - void(void) scripted_sequence; - - /* overrides */ - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(entity, int) Trigger; - virtual void(void) Respawn; - virtual void(string, string) SpawnKey; +public: + void scripted_sequence(void); - virtual void(entity) RunOnEntity; - virtual void(void) InitIdle; - virtual void(entity) Touch; + /* overrides */ + virtual void Save(float); + virtual void Restore(string,string); + virtual void Trigger(entity,int); + virtual void Respawn(void); + virtual void SpawnKey(string,string); + + virtual void RunOnEntity(entity); + virtual void InitIdle(void); + virtual void Touch(entity); + }; void diff --git a/src/gs-entbase/server/speaker.qc b/src/gs-entbase/server/speaker.qc index 579f4e12..1d49dcaf 100644 --- a/src/gs-entbase/server/speaker.qc +++ b/src/gs-entbase/server/speaker.qc @@ -70,16 +70,18 @@ speaker:NSTalkMonster string m_strSentence; float m_flVolume; - void(void) speaker; - +public: + void speaker(void); + /* overrides */ - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Respawn; - virtual void(entity, int) Trigger; + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Respawn(void); + virtual void Trigger(entity,int); + + virtual void Announce(void); - virtual void(void) Announce; }; void diff --git a/src/gs-entbase/server/targ_speaker.qc b/src/gs-entbase/server/targ_speaker.qc index 41405796..ec4757ad 100644 --- a/src/gs-entbase/server/targ_speaker.qc +++ b/src/gs-entbase/server/targ_speaker.qc @@ -38,13 +38,15 @@ targ_speaker:NSPointTrigger string m_strSample; float m_flVolume; - void(void) targ_speaker; +public: + void targ_speaker(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Respawn(void); + virtual void Trigger(entity,int); - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Respawn; - virtual void(entity,int) Trigger; }; void diff --git a/src/gs-entbase/server/target_cdaudio.qc b/src/gs-entbase/server/target_cdaudio.qc index f88e2868..936550e9 100644 --- a/src/gs-entbase/server/target_cdaudio.qc +++ b/src/gs-entbase/server/target_cdaudio.qc @@ -37,13 +37,15 @@ target_cdaudio:NSPointTrigger float m_flRadius; int m_iCDTrack; - void(void) target_cdaudio; +public: + void target_cdaudio(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Respawn(void); + virtual void Touch(entity); - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Respawn; - virtual void(entity) Touch; }; void diff --git a/src/gs-entbase/server/trigger_auto.qc b/src/gs-entbase/server/trigger_auto.qc index 4dc24d0d..498e2460 100644 --- a/src/gs-entbase/server/trigger_auto.qc +++ b/src/gs-entbase/server/trigger_auto.qc @@ -39,16 +39,18 @@ trigger_auto:NSPointTrigger int m_iTriggerState; float m_flDelay; - void(void) trigger_auto; - +public: + void trigger_auto(void); + /* overrides */ - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Respawn; - virtual void(void) RestoreComplete; + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Respawn(void); + virtual void RestoreComplete(void); + + virtual void Processing(void); - virtual void(void) Processing; }; void diff --git a/src/gs-entbase/server/trigger_autosave.qc b/src/gs-entbase/server/trigger_autosave.qc index 5d44ed3d..4c439b57 100644 --- a/src/gs-entbase/server/trigger_autosave.qc +++ b/src/gs-entbase/server/trigger_autosave.qc @@ -30,13 +30,14 @@ trigger_autosave:NSBrushTrigger { float m_flDelay; - void(void) trigger_autosave; - - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(void) Spawned; - virtual void(void) Respawn; - virtual void(entity) Touch; +public: + void trigger_autosave(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void Spawned(void); + virtual void Respawn(void); + virtual void Touch(entity); }; void diff --git a/src/gs-entbase/server/trigger_cdaudio.qc b/src/gs-entbase/server/trigger_cdaudio.qc index 5f927c7e..4b1d4621 100644 --- a/src/gs-entbase/server/trigger_cdaudio.qc +++ b/src/gs-entbase/server/trigger_cdaudio.qc @@ -30,14 +30,16 @@ trigger_cdaudio:NSBrushTrigger { int m_iCDTrack; - void(void) trigger_cdaudio; +public: + void trigger_cdaudio(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Respawn(void); + virtual void Trigger(entity,int); + virtual void Touch(entity); - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Respawn; - virtual void(entity, int) Trigger; - virtual void(entity) Touch; }; void diff --git a/src/gs-entbase/server/trigger_changelevel.qc b/src/gs-entbase/server/trigger_changelevel.qc index 4c665c30..1e5f4dbe 100644 --- a/src/gs-entbase/server/trigger_changelevel.qc +++ b/src/gs-entbase/server/trigger_changelevel.qc @@ -79,20 +79,21 @@ trigger_changelevel:NSBrushTrigger string m_strOnLevelChange; entity m_activator; - void(void) trigger_changelevel; +public: + void trigger_changelevel(void); /* overrides */ - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Spawned; - virtual void(void) Respawn; - virtual void(entity, int) Trigger; - virtual void(entity, string, string) Input; - - virtual void(void) Change; - virtual void(entity) Touch; - virtual int(entity, entity) IsInside; + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Spawned(void); + virtual void Respawn(void); + virtual void Trigger(entity,int); + virtual void Input(entity,string,string); + + virtual void Change(void); + virtual void Touch(entity); + virtual int IsInside(entity,entity); }; void diff --git a/src/gs-entbase/server/trigger_changetarget.qc b/src/gs-entbase/server/trigger_changetarget.qc index 501f0681..b1363b09 100644 --- a/src/gs-entbase/server/trigger_changetarget.qc +++ b/src/gs-entbase/server/trigger_changetarget.qc @@ -32,12 +32,14 @@ trigger_changetarget:NSPointTrigger { string m_strNewTarget; - void(void) trigger_changetarget; +public: + void trigger_changetarget(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Trigger(entity,int); - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(entity,int) Trigger; }; void diff --git a/src/gs-entbase/server/trigger_counter.qc b/src/gs-entbase/server/trigger_counter.qc index 857db1d9..285cb9c5 100644 --- a/src/gs-entbase/server/trigger_counter.qc +++ b/src/gs-entbase/server/trigger_counter.qc @@ -42,14 +42,16 @@ trigger_counter:NSBrushTrigger int m_iCounted; int m_iMaxCount; - void(void) trigger_counter; +public: + void trigger_counter(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Respawn(void); + virtual void Trigger(entity,int); + virtual void Touch(entity); - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Respawn; - virtual void(entity,int) Trigger; - virtual void(entity) Touch; }; void diff --git a/src/gs-entbase/server/trigger_endsection.qc b/src/gs-entbase/server/trigger_endsection.qc index 8a92f7e6..3025514a 100644 --- a/src/gs-entbase/server/trigger_endsection.qc +++ b/src/gs-entbase/server/trigger_endsection.qc @@ -28,10 +28,12 @@ This entity was introduced in Half-Life (1998). class trigger_endsection:NSBrushTrigger { - void(void) trigger_endsection; +public: + void trigger_endsection(void); + + virtual void Trigger(entity,int); + virtual void Respawn(void); - virtual void(entity,int) Trigger; - virtual void(void) Respawn; }; void diff --git a/src/gs-entbase/server/trigger_hurt.qc b/src/gs-entbase/server/trigger_hurt.qc index e54fe98b..4d78c1ae 100644 --- a/src/gs-entbase/server/trigger_hurt.qc +++ b/src/gs-entbase/server/trigger_hurt.qc @@ -68,6 +68,19 @@ This entity was introduced in Quake (1996). class trigger_hurt:NSBrushTrigger { +public: + void trigger_hurt(void); + + virtual void Spawned(void); + virtual void Save(float); + virtual void Restore(string,string); + virtual void Trigger(entity,int); + virtual void Touch(entity); + virtual void Respawn(void); + virtual void SpawnKey(string,string); + virtual void Input(entity,string,string); + +private: int m_iDamage; int m_iDamageType; float m_flNextTrigger; @@ -75,17 +88,6 @@ trigger_hurt:NSBrushTrigger float m_flDelay; string m_strOnHurt; string m_strOnHurtPlayer; - - void(void) trigger_hurt; - - virtual void(void) Spawned; - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(entity, int) Trigger; - virtual void(entity) Touch; - virtual void(void) Respawn; - virtual void(string, string) SpawnKey; - virtual void(entity, string, string) Input; }; void diff --git a/src/gs-entbase/server/trigger_look.qc b/src/gs-entbase/server/trigger_look.qc index e49787f2..2f2bac61 100644 --- a/src/gs-entbase/server/trigger_look.qc +++ b/src/gs-entbase/server/trigger_look.qc @@ -38,6 +38,17 @@ This entity was introduced in Half-Life 2 (2004). class trigger_look:NSBrushTrigger { +public: + void trigger_look(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); + +private: float m_flFOV; float m_flLookTime; float m_flDelay; @@ -46,15 +57,6 @@ trigger_look:NSBrushTrigger /* Input/Output */ string m_strOnTrigger; - - void(void) trigger_look; - - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Spawned; - virtual void(void) Respawn; - virtual void(entity) Touch; }; void diff --git a/src/gs-entbase/server/trigger_multiple.qc b/src/gs-entbase/server/trigger_multiple.qc index 4c6ba0e2..7e747ae2 100644 --- a/src/gs-entbase/server/trigger_multiple.qc +++ b/src/gs-entbase/server/trigger_multiple.qc @@ -47,24 +47,24 @@ enumflags class trigger_multiple:NSBrushTrigger { +public: + void trigger_multiple(void); + + virtual void Spawned(void); + virtual void Save(float); + virtual void Restore(string,string); + virtual void Touch(entity); + virtual void Respawn(void); + virtual void SpawnKey(string,string); + virtual void EndTouch(entity); + +private: float m_flWait; /* Input/Output */ string m_strOnStartTouch; string m_strOnEndTouchAll; string m_strOnTrigger; - - void(void) trigger_multiple; - - virtual void(void) Spawned; - - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(entity) Touch; - virtual void(void) Respawn; - virtual void(string, string) SpawnKey; - - virtual void(entity) EndTouch; }; void diff --git a/src/gs-entbase/server/trigger_once.qc b/src/gs-entbase/server/trigger_once.qc index 0aaa6c3b..63901100 100644 --- a/src/gs-entbase/server/trigger_once.qc +++ b/src/gs-entbase/server/trigger_once.qc @@ -41,18 +41,20 @@ enumflags class trigger_once:NSBrushTrigger { +public: + void trigger_once(void); + + virtual void Spawned(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void Touch(entity); + virtual void Respawn(void); + virtual void SpawnKey(string,string); + +private: string m_strOnStartTouch; string m_strOnTrigger; - - void(void) trigger_once; - - virtual void(void) Spawned; - - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(entity) Touch; - virtual void(void) Respawn; - virtual void(string, string) SpawnKey; }; void diff --git a/src/gs-entbase/server/trigger_playerfreeze.qc b/src/gs-entbase/server/trigger_playerfreeze.qc index 23326570..f8586a3c 100644 --- a/src/gs-entbase/server/trigger_playerfreeze.qc +++ b/src/gs-entbase/server/trigger_playerfreeze.qc @@ -33,11 +33,12 @@ This entity was introduced in Opposing Force (1999). class trigger_playerfreeze:NSBrushTrigger { - void(void) trigger_playerfreeze; - - virtual void(void) Respawn; - virtual void(entity,int) Trigger; - virtual void(void) customphysics; +public: + void trigger_playerfreeze(void); + + virtual void Respawn(void); + virtual void Trigger(entity,int); + virtual void customphysics(void); }; void diff --git a/src/gs-entbase/server/trigger_push.qc b/src/gs-entbase/server/trigger_push.qc index eb32ae96..6c9ee7f9 100644 --- a/src/gs-entbase/server/trigger_push.qc +++ b/src/gs-entbase/server/trigger_push.qc @@ -39,18 +39,20 @@ enumflags class trigger_push:NSBrushTrigger { +public: + void trigger_push(void); + + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Respawn(void); + virtual void Trigger(entity,int); + virtual void Touch(entity); + virtual void SetMovementDirection(void); + +private: vector m_vecMoveDir; float m_flSpeed; - - void(void) trigger_push; - - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Respawn; - virtual void(entity, int) Trigger; - virtual void(entity) Touch; - virtual void(void) SetMovementDirection; }; void diff --git a/src/gs-entbase/server/trigger_teleport.qc b/src/gs-entbase/server/trigger_teleport.qc index 5b1b7036..82bb728f 100644 --- a/src/gs-entbase/server/trigger_teleport.qc +++ b/src/gs-entbase/server/trigger_teleport.qc @@ -35,10 +35,11 @@ enumflags class trigger_teleport:NSBrushTrigger { - void(void) trigger_teleport; - - virtual void(entity) Touch; - virtual void(void) Respawn; +public: + void trigger_teleport(void); + + virtual void Touch(entity); + virtual void Respawn(void); }; void diff --git a/src/gs-entbase/server/trigger_transition.qc b/src/gs-entbase/server/trigger_transition.qc index d97e922d..d03aed61 100644 --- a/src/gs-entbase/server/trigger_transition.qc +++ b/src/gs-entbase/server/trigger_transition.qc @@ -28,9 +28,9 @@ This entity was introduced in Half-Life (1998). class trigger_transition:NSBrushTrigger { - void(void) trigger_transition; - - virtual void(void) Respawn; + void trigger_transition(void); + + virtual void Respawn(void); }; void diff --git a/src/gs-entbase/shared/ambient_generic.qc b/src/gs-entbase/shared/ambient_generic.qc index be92c087..ce66c8f1 100644 --- a/src/gs-entbase/shared/ambient_generic.qc +++ b/src/gs-entbase/shared/ambient_generic.qc @@ -75,25 +75,28 @@ class ambient_generic:NSTalkMonster float m_flSpawnVolume; float m_flSpawnPitch; - void(void) ambient_generic; +public: + void ambient_generic(void); /* overrides */ #ifdef SERVER - virtual void(float) Save; - virtual void(string, string) Restore; - virtual void(string, string) SpawnKey; - virtual void(void) Spawned; - virtual void(void) Respawn; - virtual void(void) EvaluateEntity; - virtual float(entity, float) SendEntity; - virtual void(entity, int) UseNormal; - virtual void(entity, int) UseLoop; + virtual void Save(float); + virtual void Restore(string,string); + virtual void SpawnKey(string,string); + virtual void Spawned(void); + virtual void Respawn(void); + virtual void EvaluateEntity(void); + virtual float SendEntity(entity,float); + virtual void UseNormal(entity,int); + virtual void UseLoop(entity,int); + #else - virtual void(float, float) ReceiveEntity; - virtual float(void) predraw; - virtual void(string) SentenceSample; + virtual void ReceiveEntity(float,float); + virtual float predraw(void); + virtual void SentenceSample(string); + #endif - virtual void(void) OnRemoveEntity; + virtual void OnRemoveEntity(void); }; void diff --git a/src/gs-entbase/shared/env_bubbles.qc b/src/gs-entbase/shared/env_bubbles.qc index 3d8f88bf..a222d519 100644 --- a/src/gs-entbase/shared/env_bubbles.qc +++ b/src/gs-entbase/shared/env_bubbles.qc @@ -68,6 +68,7 @@ env_bubbles:NSPointTrigger float m_flSpawnFrequency; float m_flSpawnCurrent; +public: void env_bubbles(void); /* overrides */ diff --git a/src/gs-entbase/shared/env_fog_controller.qc b/src/gs-entbase/shared/env_fog_controller.qc index 0266d64c..446e2451 100644 --- a/src/gs-entbase/shared/env_fog_controller.qc +++ b/src/gs-entbase/shared/env_fog_controller.qc @@ -66,29 +66,11 @@ enumflags class env_fog_controller:NSPointTrigger { - /* networked attributes */ - PREDICTED_INT(m_iFogActive) - PREDICTED_INT(m_iFogBlend) - PREDICTED_FLOAT(m_flFogStart) - PREDICTED_FLOAT(m_flFogEnd) - PREDICTED_FLOAT(m_flFogMaxDensity) - PREDICTED_FLOAT(m_flFogFarZ) - PREDICTED_VECTOR(m_vecFogColor) - PREDICTED_VECTOR(m_vecFogColor2) - PREDICTED_VECTOR(m_vecFogDir) - - void(void) env_fog_controller; - +private: #ifdef CLIENT /* temporary attributes */ float m_flNextDraw; float m_flLastDelta; - - virtual float(void) StartToBias; - virtual float(void) FogRender; - virtual void(void) FogUpdate; - virtual void(void) RendererRestarted; - virtual void(float,float) ReceiveEntity; #else /* main spawn attributes */ int m_iSpawnEnable; @@ -101,15 +83,38 @@ env_fog_controller:NSPointTrigger vector m_vecSpawnColor2; vector m_vecSpawnDir; int m_iUseAngles; +#endif - virtual float(entity, float) SendEntity; - virtual void(void) EvaluateEntity; - virtual void(entity, int) Trigger; - virtual void(void) Respawn; - virtual void(float) Save; - virtual void(string,string) Restore; - virtual void(entity, string, string) Input; - virtual void(string, string) SpawnKey; + /* networked attributes */ + PREDICTED_INT(m_iFogActive) + PREDICTED_INT(m_iFogBlend) + PREDICTED_FLOAT(m_flFogStart) + PREDICTED_FLOAT(m_flFogEnd) + PREDICTED_FLOAT(m_flFogMaxDensity) + PREDICTED_FLOAT(m_flFogFarZ) + 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); + +#else + virtual float SendEntity(entity,float); + virtual void EvaluateEntity(void); + virtual void Trigger(entity,int); + 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 }; diff --git a/src/gs-entbase/shared/env_projectedtexture.qc b/src/gs-entbase/shared/env_projectedtexture.qc index 44922812..b6d79e83 100644 --- a/src/gs-entbase/shared/env_projectedtexture.qc +++ b/src/gs-entbase/shared/env_projectedtexture.qc @@ -63,6 +63,7 @@ enumflags class env_projectedtexture:NSPointTrigger { +private: vector m_vecLight; float m_flIntensity; float m_flInnerCone; @@ -76,18 +77,19 @@ class env_projectedtexture:NSPointTrigger float m_flFOV; int m_iState; - void(void) env_projectedtexture; +public: + void env_projectedtexture(void); #ifdef CLIENT - virtual void(float,float) ReceiveEntity; - virtual float(void) predraw; + virtual void ReceiveEntity(float,float); + virtual float predraw(void); #else - virtual void(entity, int) Trigger; - virtual void(void) Respawn; - virtual float(entity, float) SendEntity; - virtual void(string, string) SpawnKey; - virtual void(entity, string, string) Input; - virtual void(void) EvaluateEntity; + virtual void Trigger(entity,int); + virtual void Respawn(void); + virtual float SendEntity(entity,float); + virtual void SpawnKey(string,string); + virtual void EvaluateEntity(void); + virtual void Input(entity, string, string); #endif }; diff --git a/src/gs-entbase/shared/env_sprite.qc b/src/gs-entbase/shared/env_sprite.qc index 0cf19c25..8eecb994 100644 --- a/src/gs-entbase/shared/env_sprite.qc +++ b/src/gs-entbase/shared/env_sprite.qc @@ -61,6 +61,7 @@ enumflags class env_sprite:NSRenderableEntity { +private: bool m_iIsShader; int m_iToggled; float m_flEffects; @@ -73,7 +74,8 @@ class env_sprite:NSRenderableEntity bool m_bLoops; #endif - void(void) env_sprite; +public: + void env_sprite(void); virtual void(bool) SetFramerate; @@ -85,11 +87,12 @@ class env_sprite:NSRenderableEntity virtual void SpawnKey(string,string); virtual void NetworkOnce(void); #else - virtual float(void) predraw; - virtual void(void) think; - virtual void(float, float) ReceiveEntity; - virtual void(int) SetMaxFrame; - virtual void(bool) SetLoopFlag; + virtual float predraw(void); + virtual void think(void); + virtual void ReceiveEntity(float,float); + virtual void SetMaxFrame(int); + virtual void SetLoopFlag(bool); + #endif }; diff --git a/src/gs-entbase/shared/func_friction.qc b/src/gs-entbase/shared/func_friction.qc index c10e3612..0c3e3ab6 100644 --- a/src/gs-entbase/shared/func_friction.qc +++ b/src/gs-entbase/shared/func_friction.qc @@ -32,13 +32,15 @@ This entity was introduced in Half-Life (1998). class func_friction:NSEntity { +private: float m_flFriction; - void(void) func_friction; - - virtual void(entity) Touch; - virtual void(void) Respawn; - virtual void(string, string) SpawnKey; +public: + void func_friction(void); + + virtual void Touch(entity); + virtual void Respawn(void); + virtual void SpawnKey(string,string); }; void diff --git a/src/gs-entbase/shared/func_illusionary.qc b/src/gs-entbase/shared/func_illusionary.qc index e748568a..cd0af68d 100644 --- a/src/gs-entbase/shared/func_illusionary.qc +++ b/src/gs-entbase/shared/func_illusionary.qc @@ -30,14 +30,15 @@ This entity was introduced in Quake (1996). class func_illusionary:NSRenderableEntity { - void(void) func_illusionary; +public: + void func_illusionary(void); #ifdef SERVER - virtual void(void) Respawn; - virtual float(entity, float) SendEntity; - virtual void(entity, int) Trigger; + virtual void Respawn(void); + virtual float SendEntity(entity,float); + virtual void Trigger(entity,int); #else - virtual void(void) Init; + virtual void Init(void); #endif }; @@ -48,7 +49,7 @@ func_illusionary:NSRenderableEntity float func_illusionary::SendEntity(entity pvsent, float fl) { - if ((GetRenderMode() != RM_NORMAL) || (targetname)) + if ((GetRenderMode() != RM_NORMAL) || HasTargetname()) return super::SendEntity(pvsent, fl); else return (0); @@ -84,7 +85,7 @@ func_illusionary::Respawn(void) ClearAngles(); // TODO: Add support for (skin) -1 = Empty, -7 = Volumetric light - if (skin < 0) { + if (GetSkin() < 0) { SetSkin(0); } } @@ -109,7 +110,7 @@ func_illusionary::Init(void) SetSolid(SOLID_NOT); if (skin == -1 && m_iRenderMode == RM_TEXTURE) - SetRenderMode(RM_TRIGGER); + Hide(); MakeStatic(); } diff --git a/src/gs-entbase/shared/func_ladder.qc b/src/gs-entbase/shared/func_ladder.qc index 3731747c..53cf1e9e 100644 --- a/src/gs-entbase/shared/func_ladder.qc +++ b/src/gs-entbase/shared/func_ladder.qc @@ -27,13 +27,15 @@ This entity was introduced in Half-Life (1998). class func_ladder:NSRenderableEntity { - void(void) func_ladder; +public: + void func_ladder(void); - virtual void(void) Respawn; + virtual void Respawn(void); #ifdef SERVER - virtual void(entity, int) Trigger; + virtual void Trigger(entity, int); #endif + }; #ifdef SERVER @@ -63,7 +65,7 @@ func_ladder::Respawn(void) SetModel(GetSpawnModel()); SetOrigin(GetSpawnOrigin()); SetFrame(0); - SetRenderMode(RM_TRIGGER); + Hide(); } void diff --git a/src/gs-entbase/shared/func_monitor.qc b/src/gs-entbase/shared/func_monitor.qc index 72f509f5..d0d6c4e7 100644 --- a/src/gs-entbase/shared/func_monitor.qc +++ b/src/gs-entbase/shared/func_monitor.qc @@ -74,6 +74,9 @@ enumflags class func_monitor:NSRenderableEntity { +#ifdef CLIENT + int m_iValue; +#endif /* these mirror the fields of a point_camera */ vector m_vecCamOrigin; vector m_vecCamAngles; @@ -85,19 +88,19 @@ class func_monitor:NSRenderableEntity float m_flFogStart; float m_flFogEnd; - void(void) func_monitor; +public: + void func_monitor(void); #ifdef CLIENT - int m_iValue; + virtual void ReceiveEntity(float,float); - virtual void(float,float) ReceiveEntity; #else - virtual void(void) Respawn; - virtual void(void) EvaluateEntity; - virtual float(entity, float) SendEntity; - virtual void(string, string) SpawnKey; - virtual void(entity, int) Trigger; - virtual void(entity, string, string) Input; + virtual void Respawn(void); + virtual void EvaluateEntity(void); + virtual float SendEntity(entity,float); + virtual void SpawnKey(string,string); + virtual void Trigger(entity,int); + virtual void Input(entity, string, string); #endif }; diff --git a/src/gs-entbase/shared/func_tankmortar.qc b/src/gs-entbase/shared/func_tankmortar.qc index 8a0b21a8..876593c7 100644 --- a/src/gs-entbase/shared/func_tankmortar.qc +++ b/src/gs-entbase/shared/func_tankmortar.qc @@ -79,26 +79,28 @@ class func_tankmortar:NSVehicle float m_flMaxRange; /* TODO */ float m_flYawRange; /* TODO */ float m_flPitchRange; /* TODO */ - float m_flFireTime; - void(void) func_tankmortar; - - virtual void(void) Spawned; - virtual void(void) PlayerInput; - virtual void(vector) SpriteSmoke; - virtual void(vector) SpriteFlash; +public: + void func_tankmortar(void); + + virtual void Spawned(void); + virtual void PlayerInput(void); + virtual void SpriteSmoke(vector); + virtual void SpriteFlash(vector); + #ifdef CLIENT - virtual void(void) PredictPreFrame; - virtual void(void) PredictPostFrame; - virtual void(float, float) ReceiveEntity; - virtual void(void) UpdateView; + virtual void PredictPreFrame(void); + virtual void PredictPostFrame(void); + virtual void ReceiveEntity(float,float); + virtual void UpdateView(void); #else - virtual void(void) EvaluateEntity; - virtual float(entity, float) SendEntity; - virtual void(void) Respawn; - virtual void(string, string) SpawnKey; + virtual void EvaluateEntity(void); + virtual float SendEntity(entity,float); + virtual void Respawn(void); + virtual void SpawnKey(string,string); #endif + }; diff --git a/src/gs-entbase/shared/func_vehicle.qc b/src/gs-entbase/shared/func_vehicle.qc index 3b4d82f3..3066c8df 100644 --- a/src/gs-entbase/shared/func_vehicle.qc +++ b/src/gs-entbase/shared/func_vehicle.qc @@ -83,20 +83,24 @@ enumflags class func_vehicle_wheel { - void() func_vehicle_wheel; - +private: #ifdef CLIENT vector origin_net; vector velocity_net; vector angles_net; - virtual void(void) PredictPreFrame; - virtual void(void) PredictPostFrame; #endif - virtual void(float) Move; - virtual void(vector) Bounce; - virtual void(float, float m_flTurn) Accel; - virtual void(float, float) Physics; +public: + void func_vehicle_wheel(void); + +#ifdef CLIENT + virtual void PredictPreFrame(void); + virtual void PredictPostFrame(void); +#endif + virtual void Move(float); + virtual void Bounce(vector); + virtual void Accel(float,float); + virtual void Physics(float,float); }; class diff --git a/src/gs-entbase/shared/func_wall.qc b/src/gs-entbase/shared/func_wall.qc index 3efea18f..8b90abaa 100644 --- a/src/gs-entbase/shared/func_wall.qc +++ b/src/gs-entbase/shared/func_wall.qc @@ -30,14 +30,15 @@ This entity was introduced in Quake (1996). class func_wall:NSRenderableEntity { - void(void) func_wall; +public: + void func_wall(void); #ifdef SERVER - virtual void(void) Respawn; - virtual float(entity, float) SendEntity; - virtual void(entity, int) Trigger; + virtual void Respawn(void); + virtual float SendEntity(entity,float); + virtual void Trigger(entity,int); #else - virtual void(void) Init; + virtual void Init(void); #endif }; diff --git a/src/gs-entbase/shared/info_particle_system.qc b/src/gs-entbase/shared/info_particle_system.qc index 29682c9b..9e426993 100644 --- a/src/gs-entbase/shared/info_particle_system.qc +++ b/src/gs-entbase/shared/info_particle_system.qc @@ -47,25 +47,28 @@ enumflags class info_particle_system:NSPointTrigger { +private: +#ifdef CLIENT + int m_iValue; + int m_iEffectID; +#endif string m_strEffectName; float m_flInterval; int m_iSpawnCount; - void(void) info_particle_system; +public: + void info_particle_system(void); #ifdef CLIENT - int m_iValue; - int m_iEffectID; - - virtual void(void) Emit; - virtual void(float,float) ReceiveEntity; + virtual void Emit(void); + virtual void ReceiveEntity(float,float); #else - virtual void(void) Respawn; - virtual void(void) EvaluateEntity; - virtual float(entity, float) SendEntity; - virtual void(string, string) SpawnKey; - virtual void(entity, int) Trigger; - virtual void(entity, string, string) Input; + virtual void Respawn(void); + virtual void EvaluateEntity(void); + virtual float SendEntity(entity,float); + virtual void SpawnKey(string,string); + virtual void Trigger(entity,int); + virtual void Input(entity, string, string); #endif }; diff --git a/src/gs-entbase/shared/light_dynamic.qc b/src/gs-entbase/shared/light_dynamic.qc index f9ecd6c6..e3370393 100644 --- a/src/gs-entbase/shared/light_dynamic.qc +++ b/src/gs-entbase/shared/light_dynamic.qc @@ -83,22 +83,22 @@ class light_dynamic:NSPointTrigger int m_iStartActive; float m_light; /* our light handle */ - void(void) light_dynamic; - virtual void(string, string) SpawnKey; +public: + void light_dynamic(void); + virtual void SpawnKey(string,string); #ifdef CLIENT - virtual void(void) OnRemoveEntity; - virtual void(float,float) ReceiveEntity; - virtual float(void) predraw; - virtual void(void) RendererRestarted; - virtual void(float) LightChanged; + virtual void OnRemoveEntity(void); + virtual void ReceiveEntity(float,float); + virtual float predraw(void); + virtual void RendererRestarted(void); + virtual void LightChanged(float); #else - - virtual void(entity, int) Trigger; - virtual void(void) Respawn; - virtual float(entity, float) SendEntity; - virtual void(entity, string, string) Input; - virtual void(void) EvaluateEntity; + virtual void Trigger(entity,int); + virtual void Respawn(void); + virtual float SendEntity(entity,float); + virtual void EvaluateEntity(void); + virtual void Input(entity, string, string); #endif }; diff --git a/src/gs-entbase/shared/prop_physics_multiplayer.qc b/src/gs-entbase/shared/prop_physics_multiplayer.qc index 86e01b16..82b46806 100644 --- a/src/gs-entbase/shared/prop_physics_multiplayer.qc +++ b/src/gs-entbase/shared/prop_physics_multiplayer.qc @@ -40,15 +40,16 @@ class prop_physics_multiplayer:NSPhysicsEntity { int m_iPhysicsMode; - void(void) prop_physics_multiplayer; +public: + void prop_physics_multiplayer(void); #ifdef CLIENT - virtual void(void) Init; + virtual void Init(void); #endif - virtual void(void) Respawn; - virtual void(string, string) SpawnKey; - virtual void(entity) Touch; - virtual void(void) TouchThink; + virtual void Respawn(void); + virtual void SpawnKey(string,string); + virtual void Touch(entity); + virtual void TouchThink(void); }; void diff --git a/src/gs-entbase/shared/prop_rope.qc b/src/gs-entbase/shared/prop_rope.qc index 987a0b6a..e6126652 100644 --- a/src/gs-entbase/shared/prop_rope.qc +++ b/src/gs-entbase/shared/prop_rope.qc @@ -59,17 +59,18 @@ class prop_rope:NSEntity PREDICTED_INT(m_iSegments) PREDICTED_VECTOR(m_vecTarget) - void(void) prop_rope; +public: + void prop_rope(void); #ifdef CLIENT - virtual float() predraw; - virtual void(float,float) ReceiveEntity; - virtual void(vector, vector, vector) DrawSegment; + virtual float predraw(void); + virtual void ReceiveEntity(float,float); + virtual void DrawSegment(vector, vector, vector); #else - virtual void(void) Respawn; - virtual void(void) EvaluateEntity; - virtual float(entity, float) SendEntity; - virtual void(string, string) SpawnKey; + virtual void Respawn(void); + virtual void EvaluateEntity(void); + virtual float SendEntity(entity,float); + virtual void SpawnKey(string,string); #endif }; diff --git a/src/gs-entbase/shared/prop_vehicle_driveable.qc b/src/gs-entbase/shared/prop_vehicle_driveable.qc index 5a8ec654..8334fd29 100644 --- a/src/gs-entbase/shared/prop_vehicle_driveable.qc +++ b/src/gs-entbase/shared/prop_vehicle_driveable.qc @@ -47,29 +47,34 @@ enumflags class prop_vehicle_driveable_wheel { - void() prop_vehicle_driveable_wheel; - +private: float m_flSuspension; float m_flSuspensionForce; #ifdef CLIENT - vector origin_net; vector velocity_net; vector angles_net; - virtual void(void) PredictPreFrame; - virtual void(void) PredictPostFrame; #endif + +public: + void prop_vehicle_driveable_wheel(void); - virtual void(float) UpdateSuspension; - virtual void(float) Move; - virtual void(vector) Bounce; - virtual void(float, float m_flTurn) Accel; - virtual void(float, float) Physics; +#ifdef CLIENT + virtual void PredictPreFrame(void); + virtual void PredictPostFrame(void); +#endif + + virtual void UpdateSuspension(float); + virtual void Move(float); + virtual void Bounce(vector); + virtual void Accel(float,float); + virtual void Physics(float,float); }; class prop_vehicle_driveable:NSVehicle { +private: /* map-entity fields */ float m_flBounceFactor; float m_flAcceleration; @@ -101,26 +106,27 @@ class prop_vehicle_driveable:NSVehicle float m_flUseTime; - void(void) prop_vehicle_driveable; - - virtual void(void) Spawned; - virtual void(void) Physics; - virtual void(void) RunVehiclePhysics; - virtual void(void) WeaponInput; - virtual void(void) PlayerInput; - virtual void(void) OnRemoveEntity; - +public: + void prop_vehicle_driveable(void); + + virtual void Spawned(void); + virtual void Physics(void); + virtual void RunVehiclePhysics(void); + virtual void WeaponInput(void); + virtual void PlayerInput(void); + virtual void OnRemoveEntity(void); + #ifdef CLIENT - virtual bool(void) HideViewWeapon; - virtual void(void) PredictPreFrame; - virtual void(void) PredictPostFrame; - virtual void(float, float) ReceiveEntity; - virtual void(void) UpdateView; + virtual bool HideViewWeapon(void); + virtual void PredictPreFrame(void); + virtual void PredictPostFrame(void); + virtual void ReceiveEntity(float,float); + virtual void UpdateView(void); #else - virtual void(void) Respawn; - virtual void(void) OnPlayerUse; - virtual void(void) EvaluateEntity; - virtual float(entity, float) SendEntity; + virtual void Respawn(void); + virtual void OnPlayerUse(void); + virtual void EvaluateEntity(void); + virtual float SendEntity(entity,float); #endif }; diff --git a/src/gs-entbase/shared/trigger_camera.qc b/src/gs-entbase/shared/trigger_camera.qc index 0782bf0e..d013f377 100644 --- a/src/gs-entbase/shared/trigger_camera.qc +++ b/src/gs-entbase/shared/trigger_camera.qc @@ -51,18 +51,19 @@ class trigger_camera:NSPointTrigger entity m_eLooker; #endif - void(void) trigger_camera; +public: + void trigger_camera(void); #ifdef CLIENT - virtual void(float,float) ReceiveEntity; + virtual void ReceiveEntity(float,float); #else - virtual void(void) NextPath; - virtual void(void) GoToTarget; - virtual void(entity, int) Trigger; - virtual void(void) Respawn; - virtual void(string, string) SpawnKey; - virtual float(entity, float) SendEntity; - virtual void(void) EvaluateEntity; + virtual void NextPath(void); + virtual void GoToTarget(void); + virtual void Trigger(entity,int); + virtual void Respawn(void); + virtual void SpawnKey(string,string); + virtual float SendEntity(entity,float); + virtual void EvaluateEntity(void); #endif }; diff --git a/src/gs-entbase/shared/trigger_gravity.qc b/src/gs-entbase/shared/trigger_gravity.qc index f1ac3b83..1b52b2a7 100644 --- a/src/gs-entbase/shared/trigger_gravity.qc +++ b/src/gs-entbase/shared/trigger_gravity.qc @@ -36,16 +36,17 @@ class trigger_gravity:NSBrushTrigger { float m_flGravity; - void(void) trigger_gravity; - +public: + void trigger_gravity(void); + #ifdef SERVER - virtual void(float) Save; - virtual void(string, string) Restore; + virtual void Save(float); + virtual void Restore(string,string); #endif - virtual void(string, string) SpawnKey; - virtual void(void) Spawned; - virtual void(void) Respawn; - virtual void(entity) Touch; + virtual void SpawnKey(string,string); + virtual void Spawned(void); + virtual void Respawn(void); + virtual void Touch(entity); }; void diff --git a/src/gs-entbase/shared/worldspawn.qc b/src/gs-entbase/shared/worldspawn.qc index dffd4e1c..3420c180 100644 --- a/src/gs-entbase/shared/worldspawn.qc +++ b/src/gs-entbase/shared/worldspawn.qc @@ -53,10 +53,12 @@ var int g_iHDREnabled = 0; class worldspawn:NSEntity { - void(void) worldspawn; +public: + void worldspawn(void); + + virtual void SpawnKey(string,string); + virtual void Spawned(void); - virtual void(string, string) SpawnKey; - virtual void(void) Spawned; }; void diff --git a/src/server/defs.h b/src/server/defs.h index ddd1d0a6..eef1adae 100644 --- a/src/server/defs.h +++ b/src/server/defs.h @@ -24,7 +24,6 @@ #include "weapons.h" #include "plugins.h" #include "NSTraceAttack.h" -#include "footsteps.h" #include "route.h" #include "way.h" diff --git a/src/server/entry.qc b/src/server/entry.qc index e7c9a277..08e463df 100644 --- a/src/server/entry.qc +++ b/src/server/entry.qc @@ -380,8 +380,6 @@ initents(void) precache_sound("debris/concrete2.wav"); precache_sound("debris/concrete3.wav"); - Footsteps_Init(); - precache_sound("player/pl_fallpain3.wav"); precache_sound("items/9mmclip1.wav"); precache_sound("items/gunpickup2.wav"); diff --git a/src/server/footsteps.h b/src/server/footsteps.h deleted file mode 100644 index bda334f4..00000000 --- a/src/server/footsteps.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2016-2020 Marco Cawthorne - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER - * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -void Footsteps_Init(void); \ No newline at end of file diff --git a/src/server/footsteps.qc b/src/server/footsteps.qc deleted file mode 100644 index cfa67eb7..00000000 --- a/src/server/footsteps.qc +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2016-2022 Vera Visions LLC. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER - * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ - -/* -================= -Footsteps_Init - -Just precaching sound shaders for all the types of material oriented footsteps. -================= -*/ -void -Footsteps_Init(void) -{ -} diff --git a/src/server/include.src b/src/server/include.src index 35762439..74a96dc0 100644 --- a/src/server/include.src +++ b/src/server/include.src @@ -8,9 +8,7 @@ sentences.qc spawn.qc NSGameRules.qc client.qc -server.qc NSTraceAttack.qc -footsteps.qc vote.qc weapons.qc modelevent.qc diff --git a/src/server/server.qc b/src/server/server.qc deleted file mode 100644 index 70b786d1..00000000 --- a/src/server/server.qc +++ /dev/null @@ -1 +0,0 @@ -// TODO diff --git a/src/shared/NSClientPlayer.h b/src/shared/NSClientPlayer.h index a67e6ee4..4cff2c95 100644 --- a/src/shared/NSClientPlayer.h +++ b/src/shared/NSClientPlayer.h @@ -22,6 +22,73 @@ of type NSClientPlayer. class NSClientPlayer:NSClientSpectator { +public: + void NSClientPlayer(void); + + virtual void ClientInput(void); + virtual void PreFrame(void); + virtual void PostFrame(void); + + virtual void Physics_Fall(float); + virtual void Physics_Crouch(void); + virtual void Physics_Jump(void); + virtual void Physics_CheckJump(float); + virtual void Physics_SetViewParms(void); + virtual void Physics_WaterJump(void); + virtual void Physics_WaterMove(void); + virtual float Physics_MaxSpeed(void); + virtual void Physics_InputPreMove(void); + virtual void Physics_InputPostMove(void); + virtual void Physics_Run(void); + + virtual bool IsFakeSpectator(void); + virtual bool IsRealSpectator(void); + virtual bool IsDead(void); + virtual bool IsPlayer(void); + + /** Empty & shared between Client and Server. This is run on every player, every frame, to update their animation cycle. */ + virtual void UpdatePlayerAnimation(float); + + +#ifdef CLIENT + virtual void VehicleRelink(void); + virtual void OnRemoveEntity(void); + virtual void ReceiveEntity(float,float); + virtual void PredictPreFrame(void); + virtual void PredictPostFrame(void); + virtual void ClientInputFrame(void); + virtual void UpdateAliveCam(void); + + virtual float predraw(void); + virtual void postdraw(void); + + /** Empty. Updates the bone controller responsible for mouth movement. */ + virtual void UpdatePlayerJaw(float); + + /** Empty. This is run on every player, every frame to update attachments. */ + virtual void UpdatePlayerAttachments(bool); + +#else + virtual void Save(float); + virtual void Restore(string,string); + virtual void Respawn(void); + virtual void EvaluateEntity(void); + virtual float SendEntity(entity,float); + virtual float OptimiseChangedFlags(entity,float); + + virtual void Death(void); + virtual void MakePlayer(void); + virtual void MakeTempSpectator(void); + + virtual void InputUse_Down(void); + virtual void InputUse_Up(void); + +#endif + + virtual void Footsteps_Update(void); + +private: + #ifdef SERVER PREDICTED_INT_N(weaponframe) #else @@ -66,33 +133,6 @@ NSClientPlayer:NSClientSpectator /* any mods that use hooks */ entity hook; - void(void) NSClientPlayer; - - virtual void(void) ClientInput; - - virtual void(void) PreFrame; - virtual void(void) PostFrame; - - virtual void(float) Physics_Fall; - virtual void(void) Physics_Crouch; - virtual void(void) Physics_Jump; - virtual void(float) Physics_CheckJump; - virtual void(void) Physics_SetViewParms; - virtual void(void) Physics_WaterJump; - virtual void(void) Physics_WaterMove; - virtual float(void) Physics_MaxSpeed; - virtual void(void) Physics_InputPreMove; - virtual void(void) Physics_InputPostMove; - virtual void(void) Physics_Run; - - virtual bool(void) IsFakeSpectator; - virtual bool(void) IsRealSpectator; - virtual bool(void) IsDead; - virtual bool(void) IsPlayer; - - /** Empty & shared between Client and Server. This is run on every player, every frame, to update their animation cycle. */ - virtual void UpdatePlayerAnimation(float); - #ifdef CLIENT int sequence; @@ -101,23 +141,6 @@ NSClientPlayer:NSClientSpectator int p_hand_bone; int p_model_bone; float lastweapon; - - virtual void(void) VehicleRelink; - virtual void(void) OnRemoveEntity; - virtual void(float, float) ReceiveEntity; - virtual void(void) PredictPreFrame; - virtual void(void) PredictPostFrame; - virtual void(void) ClientInputFrame; - virtual void(void) UpdateAliveCam; - - virtual float predraw(void); - virtual void postdraw(void); - - /** Empty. Updates the bone controller responsible for mouth movement. */ - virtual void UpdatePlayerJaw(float); - - /** Empty. This is run on every player, every frame to update attachments. */ - virtual void UpdatePlayerAttachments(bool); #else int voted; int step; @@ -128,23 +151,7 @@ NSClientPlayer:NSClientSpectator float m_flPainTime; entity last_used; - - virtual void(float) Save; - virtual void(string,string) Restore; - virtual void(void) Respawn; - virtual void(void) EvaluateEntity; - virtual float(entity, float) SendEntity; - virtual float(entity, float) OptimiseChangedFlags; - - virtual void(void) Death; - virtual void(void) MakePlayer; - virtual void(void) MakeTempSpectator; - - virtual void(void) InputUse_Down; - virtual void(void) InputUse_Up; #endif - - virtual void Footsteps_Update(void); }; /* all potential SendFlags bits we can possibly send */ diff --git a/src/shared/NSMonster.qc b/src/shared/NSMonster.qc index 958151cc..2e25b9ad 100644 --- a/src/shared/NSMonster.qc +++ b/src/shared/NSMonster.qc @@ -918,10 +918,6 @@ NSMonster::SendEntity(entity ePEnt, float flChanged) WriteByte(MSG_ENTITY, ENT_MONSTER); - /* don't network triggers unless provoked */ - /*if (cvar("developer") == 0 && m_iRenderMode == RM_TRIGGER) - return (0);*/ - /* broadcast how much data is expected to be read */ WriteFloat(MSG_ENTITY, flChanged); diff --git a/src/shared/NSRenderableEntity.h b/src/shared/NSRenderableEntity.h index 46634b28..af20a9ee 100644 --- a/src/shared/NSRenderableEntity.h +++ b/src/shared/NSRenderableEntity.h @@ -51,7 +51,6 @@ typedef enum RM_ADDFRAC = 7, /* Source 2004 */ RM_WORLDGLOW = 9, /* Source 2004 */ RM_DONTRENDER = 10, /* Source 2004 */ - RM_TRIGGER } rendermode_t; typedef enum @@ -79,7 +78,6 @@ typedef enum } renderfx_t; #ifdef CLIENT -var int autocvar_cl_showtriggers = FALSE; var int autocvar_rm_unlit_additive = TRUE; var int autocvar_rm_unlit_texture = TRUE; #endif @@ -141,7 +139,7 @@ public: /* model events */ /** Callback for any model event that gets triggered while playing a framegroup. */ - virtual void HandleAnimEvent(float, int,string); + virtual void HandleAnimEvent(float,int,string); /* set */ /** Sets the bodygroup of the entity. */ diff --git a/src/shared/NSRenderableEntity.qc b/src/shared/NSRenderableEntity.qc index bbd9e508..7d787702 100644 --- a/src/shared/NSRenderableEntity.qc +++ b/src/shared/NSRenderableEntity.qc @@ -332,15 +332,6 @@ NSRenderableEntity::RenderFXPass(void) drawflags = 7; abslight = 128; break; - case RM_TRIGGER: - if (autocvar_cl_showtriggers) { - effects = EF_FULLBRIGHT; - alpha = 0.75f; - colormod = [1,0,0]; - } else { - alpha = 0.0f; - } - break; case RM_DONTRENDER: /* prevent addentity() from being called */ alpha = 0.0f; diff --git a/src/shared/NSSurfacePropEntity.qc b/src/shared/NSSurfacePropEntity.qc index 09502817..2f2c478b 100644 --- a/src/shared/NSSurfacePropEntity.qc +++ b/src/shared/NSSurfacePropEntity.qc @@ -142,9 +142,6 @@ NSSurfacePropEntity::SendEntity(entity ePEnt, float fChanged) WriteByte(MSG_ENTITY, ENT_SURFPROP); - /* don't network triggers unless provoked */ - /*if (cvar("developer") == 0 && m_iRenderMode == RM_TRIGGER) - return (0);*/ #if 0 if (fChanged == 0xFFFFFF) { for (int i = 0; i < n_NSSurfacePropEntity.length; i++) { diff --git a/src/shared/NSTalkMonster.qc b/src/shared/NSTalkMonster.qc index 5e53f537..ac5343a4 100644 --- a/src/shared/NSTalkMonster.qc +++ b/src/shared/NSTalkMonster.qc @@ -664,10 +664,6 @@ NSTalkMonster::SendEntity(entity ePEnt, float flChanged) WriteByte(MSG_ENTITY, ENT_TALKMONSTER); - /* don't network triggers unless provoked */ - /*if (cvar("developer") == 0 && m_iRenderMode == RM_TRIGGER) - return (0);*/ - /* broadcast how much data is expected to be read */ WriteFloat(MSG_ENTITY, flChanged);