diff --git a/src/gs-entbase/server.src b/src/gs-entbase/server.src index 100b1e56..2c399185 100644 --- a/src/gs-entbase/server.src +++ b/src/gs-entbase/server.src @@ -41,7 +41,6 @@ server/func_brush.qc server/func_door.qc server/func_door_rotating.qc server/func_lod.qc -server/func_ladder.qc server/func_train.qc server/func_guntarget.qc server/func_tracktrain.qc diff --git a/src/gs-entbase/server/func_ladder.qc b/src/gs-entbase/server/func_ladder.qc deleted file mode 100644 index cc532945..00000000 --- a/src/gs-entbase/server/func_ladder.qc +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2016-2020 Marco Hladik - * - * 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. - */ - -/*QUAKED func_ladder (0 .5 .8) ? -"targetname" Name - -Ladder volume. Climb up ladders with this one simple brush. - -Trivia: -This entity was introduced in Half-Life (1998). -*/ - -class func_ladder:CBaseEntity -{ - virtual void(void) Respawn; -}; - -void func_ladder::Respawn(void) -{ - SetModel(m_oldModel); - SetMovetype(MOVETYPE_NONE); - SetSkin(CONTENT_LADDER); - SetSolid(SOLID_BSP); - -#ifdef GS_RENDERFX - SetRenderMode(RM_TRIGGER); -#endif -} diff --git a/src/gs-entbase/shared.src b/src/gs-entbase/shared.src index 4b633080..df52a5f8 100644 --- a/src/gs-entbase/shared.src +++ b/src/gs-entbase/shared.src @@ -10,6 +10,7 @@ shared/env_projectedtexture.qc shared/light_dynamic.qc shared/func_monitor.qc shared/func_illusionary.qc +shared/func_ladder.qc shared/func_wall.qc shared/trigger_camera.qc shared/trigger_gravity.qc diff --git a/src/gs-entbase/shared/func_ladder.qc b/src/gs-entbase/shared/func_ladder.qc new file mode 100644 index 00000000..05629b54 --- /dev/null +++ b/src/gs-entbase/shared/func_ladder.qc @@ -0,0 +1,139 @@ +/* + * Copyright (c) 2016-2021 Marco Hladik + * + * 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. + */ + +/*QUAKED func_ladder (0 .5 .8) ? +"targetname" Name + +Ladder volume. Climb up ladders with this one simple brush. + +Trivia: +This entity was introduced in Half-Life (1998). +*/ + +class +#ifdef CLIENT +func_ladder:CBaseEntity +#else +func_ladder:CBaseTrigger +#endif +{ + void(void) func_ladder; + +#ifdef SERVER + virtual void(void) Respawn; + virtual float(entity, float) SendEntity; + virtual void(entity, int) Trigger; +#else + virtual float() predraw; + virtual void(void) Init; +#endif +}; + +#ifdef SERVER +/* we're overriding SendEntity so that we don't network func_walls + * without a targetname. They'll never experience gameplay changes + * and therefore can be handled fully client-side */ +float +func_ladder::SendEntity(entity pvsent, float fl) +{ + if (targetname) + return CBaseTrigger::SendEntity(pvsent, fl); + else + return (0); +} + +void +func_ladder::Trigger(entity act, int state) +{ + switch (state) { + case TRIG_OFF: + SetFrame(0); + break; + case TRIG_ON: + SetFrame(1); + break; + default: + SetFrame(1 - frame); + } +} + +void +func_ladder::Respawn(void) +{ + /* reset the visual parameters */ + CBaseEntity::Respawn(); + + /* func_ladder specifics */ + SetAngles([0,0,0]); + SetMovetype(MOVETYPE_NONE); + SetSolid(SOLID_BSP); + SetSkin(CONTENT_LADDER); + SetModel(m_oldModel); + SetOrigin(m_oldOrigin); + SetFrame(0); +#ifdef GS_RENDERFX + SetRenderMode(RM_TRIGGER); +#endif +} +#else +float +func_ladder::predraw(void) +{ + vector vecPlayer; + + int s = (float)getproperty(VF_ACTIVESEAT); + pSeat = &g_seats[s]; + vecPlayer = pSeat->m_vecPredictedOrigin; + + if (checkpvs(vecPlayer, this) == FALSE) { + return (PREDRAW_NEXT); + } + + CBaseEntity::predraw(); + addentity(self); + return (PREDRAW_NEXT); +} + +void +func_ladder::Init(void) +{ + CBaseEntity::Init(); + + /* this entity is being controlled by the server, remove it */ + if (targetname) { + think = Util_Destroy; + nextthink = time + 0.01f; /* time may be 0.0 */ + return; + } + + precache_model(model); + setmodel(this, model); + setorigin(this, origin); + movetype = MOVETYPE_NONE; + solid = SOLID_BSP; + skin = CONTENT_LADDER; +} +#endif + +void +func_ladder::func_ladder(void) +{ +#ifdef CLIENT + Init(); +#else + CBaseTrigger::CBaseTrigger(); +#endif +}