From f1190cd282adcd3305d5091c89c04b858d7e5d8e Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Tue, 24 Mar 2020 07:26:49 +0100 Subject: [PATCH] Fixed compiling against the latest entity-codebase --- src/client/defs.h | 1 + src/client/entry.c | 1 + src/gs-entbase/client/env_cubemap.cpp | 2 +- src/gs-entbase/client/env_glow.cpp | 2 +- src/gs-entbase/client/env_sound.cpp | 2 +- src/gs-entbase/client/env_soundscape.cpp | 2 +- src/gs-entbase/client/func_lod.cpp | 10 ++++++++++ src/gs-entbase/client/func_physbox.cpp | 20 ++++++++++++++++++++ src/gs-entbase/client/point_message.cpp | 2 +- src/gs-entbase/client/prop_dynamic.cpp | 2 +- src/gs-entbase/client/prop_rope.cpp | 3 ++- src/gs-entbase/client/sky_camera.cpp | 2 +- src/gs-entbase/server/ambient_generic.cpp | 2 +- src/gs-entbase/server/env_fade.cpp | 2 +- src/gs-entbase/server/env_shake.cpp | 2 +- src/gs-entbase/server/func_breakable.cpp | 13 +++++++++++++ src/menu-fn/master.cpp | 20 ++++++++++++++++++-- src/shared/hunger/w_ap9.c | 4 ++-- src/shared/hunger/w_chaingun.c | 1 + src/shared/hunger/w_flame.c | 8 ++++---- src/shared/hunger/w_glock.c | 11 +++++++++-- 21 files changed, 91 insertions(+), 21 deletions(-) diff --git a/src/client/defs.h b/src/client/defs.h index 021215b0..5edc0ad5 100644 --- a/src/client/defs.h +++ b/src/client/defs.h @@ -53,6 +53,7 @@ var float PARTICLE_PIECES_BLACK; var float PARTICLE_SMOKE_BROWN; var float PARTICLE_SMOKE_GREY; var float PARTICLE_SPARK; +var float PART_DUSTMOTE; var float DECAL_SHOT; var float DECAL_GLASS; diff --git a/src/client/entry.c b/src/client/entry.c index 9a473f37..41d7b5d2 100644 --- a/src/client/entry.c +++ b/src/client/entry.c @@ -72,6 +72,7 @@ CSQC_Init(float apilevel, string enginename, float engineversion) PARTICLE_BLOOD = particleeffectnum("part_blood"); DECAL_SHOT = particleeffectnum("decal_shot"); DECAL_GLASS = particleeffectnum("decal_glass"); + PART_DUSTMOTE = particleeffectnum("volume.dustmote"); /* 2D Pics */ precache_pic("gfx/vgui/icntlk_sv"); diff --git a/src/gs-entbase/client/env_cubemap.cpp b/src/gs-entbase/client/env_cubemap.cpp index 81f85bcd..ec47f781 100644 --- a/src/gs-entbase/client/env_cubemap.cpp +++ b/src/gs-entbase/client/env_cubemap.cpp @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED env_cubemap (1 0 0) (-8 -8 -8) (8 8 8) +/*QUAKED env_cubemap (0 0 1) (-8 -8 -8) (8 8 8) "scale" Texture dimension at which to render the cubemap. Default is '32'. Specifies a location for which a cubemap will be generated when the diff --git a/src/gs-entbase/client/env_glow.cpp b/src/gs-entbase/client/env_glow.cpp index fd50e665..6fc4be79 100644 --- a/src/gs-entbase/client/env_glow.cpp +++ b/src/gs-entbase/client/env_glow.cpp @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED env_glow (1 0 0) (-8 -8 -8) (8 8 8) +/*QUAKED env_glow (0 0.5 1) (-8 -8 -8) (8 8 8) "shader" Material to use for the glare/glow effect. "model" Sprite model to use for the glare/glow (idTech 2 BSPs only) "scale" Scale multiplier. diff --git a/src/gs-entbase/client/env_sound.cpp b/src/gs-entbase/client/env_sound.cpp index 1b19b41e..fa6e3d83 100644 --- a/src/gs-entbase/client/env_sound.cpp +++ b/src/gs-entbase/client/env_sound.cpp @@ -17,7 +17,7 @@ /* this is causing crashes on OpenAL 1.19.1 when enabled */ //#define DSP_LERP -/*QUAKED env_sound (1 0 0) (-8 -8 -8) (8 8 8) +/*QUAKED env_sound (0 1 0.5) (-8 -8 -8) (8 8 8) "radius" Radius in units. "roomtype" Roomtype value: 0 = DEFAULT diff --git a/src/gs-entbase/client/env_soundscape.cpp b/src/gs-entbase/client/env_soundscape.cpp index 7457ba54..11ae1f9d 100644 --- a/src/gs-entbase/client/env_soundscape.cpp +++ b/src/gs-entbase/client/env_soundscape.cpp @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED env_soundscape (1 0 0) (-8 -8 -8) (8 8 8) +/*QUAKED env_soundscape (0 1 0.3) (-8 -8 -8) (8 8 8) "radius" Radius in units. "shader" Sound shader to play. diff --git a/src/gs-entbase/client/func_lod.cpp b/src/gs-entbase/client/func_lod.cpp index 1fb3ca0e..ee031a1c 100644 --- a/src/gs-entbase/client/func_lod.cpp +++ b/src/gs-entbase/client/func_lod.cpp @@ -14,6 +14,16 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/*QUAKED func_lod (1 0 0) (-8 -8 -8) (8 8 8) ? +"targetname" Name +"DisappearDist" Distance in units for of when the func_lod will "pop" out of view. +"Solid" +0 = Solid +1 = Nonsolid + +Level of Detail brush entity, disappears at a set distance. Useful for when VIS is impossible or not enough. +*/ + #ifdef DEVELOPER var int autocvar_dev_loddistance = 0; #endif diff --git a/src/gs-entbase/client/func_physbox.cpp b/src/gs-entbase/client/func_physbox.cpp index 1c0a3303..61e1e9c6 100644 --- a/src/gs-entbase/client/func_physbox.cpp +++ b/src/gs-entbase/client/func_physbox.cpp @@ -1,4 +1,24 @@ +/* + * Copyright (c) 2016-2019 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_physbox (1 0 0) (-8 -8 -8) (8 8 8) ? +"targetname" Name +"material" Type of material the entity is made of. See func_breakable for full list. +Physics based brush entity +*/ /*class func_physbox:CBaseEntity { int m_iShape; diff --git a/src/gs-entbase/client/point_message.cpp b/src/gs-entbase/client/point_message.cpp index cab54fce..17f7007a 100644 --- a/src/gs-entbase/client/point_message.cpp +++ b/src/gs-entbase/client/point_message.cpp @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED point_message (1 0 0) (-8 -8 -8) (8 8 8) +/*QUAKED point_message (0.2 1 0.2) (-8 -8 -8) (8 8 8) "message" The message to display. "radius" The radius in which it will appear. diff --git a/src/gs-entbase/client/prop_dynamic.cpp b/src/gs-entbase/client/prop_dynamic.cpp index aeca2d26..3a00f8ae 100644 --- a/src/gs-entbase/client/prop_dynamic.cpp +++ b/src/gs-entbase/client/prop_dynamic.cpp @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED prop_dynamic (1 0 0) (-8 -8 -8) (8 8 8) SF_BASIC_COL +/*QUAKED prop_dynamic (0 0.2 1) (-8 -8 -8) (8 8 8) SF_BASIC_COL "model" Model file that will be displayed by the entity. "modelscale" Scale modifier of the model. Default is '1'. "angles" Sets the pitch, yaw and roll angles of the model. diff --git a/src/gs-entbase/client/prop_rope.cpp b/src/gs-entbase/client/prop_rope.cpp index c2a6e2e6..9e11707d 100644 --- a/src/gs-entbase/client/prop_rope.cpp +++ b/src/gs-entbase/client/prop_rope.cpp @@ -14,11 +14,12 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED prop_rope (1 0 0) (-8 -8 -8) (8 8 8) ROPE_HALF +/*QUAKED prop_rope (1 1 0.5) (-8 -8 -8) (8 8 8) ROPE_HALF "sag" Multiplier on how much sagginess will be applied to the rope. "segments" Number of total segments. Default is 16. "material" The texture to use on the rope. "swingfactor" Multiplier on how much the rope swings about. +"target" The info_notnull to connect the rope to. Client-side decorative entity. Connect the entity to a named info_notnull and watch it swing around. diff --git a/src/gs-entbase/client/sky_camera.cpp b/src/gs-entbase/client/sky_camera.cpp index 79699276..a9222349 100644 --- a/src/gs-entbase/client/sky_camera.cpp +++ b/src/gs-entbase/client/sky_camera.cpp @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED sky_camera (1 0 0) (-8 -8 -8) (8 8 8) +/*QUAKED sky_camera (1 0.3 1) (-8 -8 -8) (8 8 8) "scale" Scale modifier. Default is '16'. Defines the position of a skyroom camera. diff --git a/src/gs-entbase/server/ambient_generic.cpp b/src/gs-entbase/server/ambient_generic.cpp index d48e60b0..e5f5ee73 100644 --- a/src/gs-entbase/server/ambient_generic.cpp +++ b/src/gs-entbase/server/ambient_generic.cpp @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED ambient_generic (1 0 0) (-8 -8 -8) (8 8 8) AS_ARADIUS AS_SRADIUS AS_MRADIUS AS_LRADIUS AS_SILENT AS_NOTTOGGLED +/*QUAKED ambient_generic (1 1 1) (-8 -8 -8) (8 8 8) AS_ARADIUS AS_SRADIUS AS_MRADIUS AS_LRADIUS AS_SILENT AS_NOTTOGGLED "targetname" Name "target" Target when triggered. "killtarget" Target to kill when triggered. diff --git a/src/gs-entbase/server/env_fade.cpp b/src/gs-entbase/server/env_fade.cpp index e69db0e9..025baa61 100644 --- a/src/gs-entbase/server/env_fade.cpp +++ b/src/gs-entbase/server/env_fade.cpp @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED env_fade (1 0 0) (-8 -8 -8) (8 8 8) EVF_FADEDROM EVF_MODULATE EVF_ONLYUSER +/*QUAKED env_fade (0 0 0) (-8 -8 -8) (8 8 8) EVF_FADEDROM EVF_MODULATE EVF_ONLYUSER "targetname" Name "target" Target when triggered. "killtarget" Target to kill when triggered. diff --git a/src/gs-entbase/server/env_shake.cpp b/src/gs-entbase/server/env_shake.cpp index 165538cd..9fe13e44 100644 --- a/src/gs-entbase/server/env_shake.cpp +++ b/src/gs-entbase/server/env_shake.cpp @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*QUAKED env_shake (1 0 0) (-8 -8 -8) (8 8 8) EVS_GLOBAL +/*QUAKED env_shake (1 0.5 0) (-8 -8 -8) (8 8 8) EVS_GLOBAL "targetname" Name "target" Target when triggered. "killtarget" Target to kill when triggered. diff --git a/src/gs-entbase/server/func_breakable.cpp b/src/gs-entbase/server/func_breakable.cpp index 0583b893..4ee61619 100755 --- a/src/gs-entbase/server/func_breakable.cpp +++ b/src/gs-entbase/server/func_breakable.cpp @@ -24,6 +24,19 @@ Brush volume that can break into lots of little pieces. +Material list: + +0 = Glass +1 = Wood +2 = Metal +3 = Flesh +4 = Cinder +5 = Tile +6 = Computer +7 = Glass (Unbreakable) +8 = Rock +9 = None + When SF_TOUCH is set, it'll break when an entity runs into it at high velocities (damage is speed in units * 0.01). diff --git a/src/menu-fn/master.cpp b/src/menu-fn/master.cpp index b1f9903a..4662b989 100644 --- a/src/menu-fn/master.cpp +++ b/src/menu-fn/master.cpp @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define MASTER_DNS "frag-net.com" +#define MASTER_DNS "master.frag-net.com" #define MASTER_PORT 27950 float srv_fldAdress; @@ -54,7 +54,15 @@ void Master_GetInternetList(void) { print("Updating host cache...\n"); string url = sprintf("%s:%d",MASTER_DNS,MASTER_PORT); - cvar_set("net_masterextra1", url); + cvar_set("net_master1", url); + localcmd("net_master2 \"\"\n"); + localcmd("net_master3 \"\"\n"); + localcmd("net_master4 \"\"\n"); + localcmd("net_master5 \"\"\n"); + localcmd("net_master6 \"\"\n"); + localcmd("net_master7 \"\"\n"); + localcmd("net_master8 \"\"\n"); + localcmd("net_masterextra1 \"\"\n"); localcmd("net_masterextra2 \"\"\n"); localcmd("net_masterextra3 \"\"\n"); localcmd("net_masterextra4 \"\"\n"); @@ -70,6 +78,14 @@ void Master_GetInternetList(void) void Master_GetLANList(void) { + localcmd("net_master1 \"localhost\"\n"); + localcmd("net_master2 \"\"\n"); + localcmd("net_master3 \"\"\n"); + localcmd("net_master4 \"\"\n"); + localcmd("net_master5 \"\"\n"); + localcmd("net_master6 \"\"\n"); + localcmd("net_master7 \"\"\n"); + localcmd("net_master8 \"\"\n"); localcmd("net_masterextra1 \"\"\n"); localcmd("net_masterextra2 \"\"\n"); localcmd("net_masterextra3 \"\"\n"); diff --git a/src/shared/hunger/w_ap9.c b/src/shared/hunger/w_ap9.c index 6a6cf01e..864a0ecd 100644 --- a/src/shared/hunger/w_ap9.c +++ b/src/shared/hunger/w_ap9.c @@ -300,7 +300,7 @@ w_ap9_hudpic(int selected, vector pos) drawsubpic( pos, [170,45], - "sprites/tfchud05.spr_0.tga", + "sprites/tfchud04.spr_0.tga", [0,90/256], [170/256,45/256], g_hud_color, @@ -311,7 +311,7 @@ w_ap9_hudpic(int selected, vector pos) drawsubpic( pos, [170,45], - "sprites/tfchud06.spr_0.tga", + "sprites/tfchud05.spr_0.tga", [0,0], [170/256,45/256], g_hud_color, diff --git a/src/shared/hunger/w_chaingun.c b/src/shared/hunger/w_chaingun.c index 39696f47..c13a9920 100644 --- a/src/shared/hunger/w_chaingun.c +++ b/src/shared/hunger/w_chaingun.c @@ -32,6 +32,7 @@ w_chaingun_precache(void) precache_model("models/v_tfac.mdl"); precache_model("models/w_tfac.mdl"); precache_model("models/p_tfac.mdl"); + precache_sound("weapons/asscan1.wav"); precache_sound("weapons/asscan3.wav"); } diff --git a/src/shared/hunger/w_flame.c b/src/shared/hunger/w_flame.c index b5a8edf7..abc3254e 100644 --- a/src/shared/hunger/w_flame.c +++ b/src/shared/hunger/w_flame.c @@ -214,8 +214,8 @@ if (selected) { drawsubpic( pos, [170,45], - "sprites/640hud5.spr_0.tga", - [0,135/256], + "sprites/tfchud04.spr_0.tga", + [0,45/256], [170/256,45/256], g_hud_color, 1.0f, @@ -225,8 +225,8 @@ if (selected) { drawsubpic( pos, [170,45], - "sprites/640hud2.spr_0.tga", - [0,135/256], + "sprites/tfchud03.spr_0.tga", + [0,0/256], [170/256,45/256], g_hud_color, 1.0f, diff --git a/src/shared/hunger/w_glock.c b/src/shared/hunger/w_glock.c index 4e6f592b..dcfe21c6 100644 --- a/src/shared/hunger/w_glock.c +++ b/src/shared/hunger/w_glock.c @@ -204,16 +204,23 @@ w_glock_secondary(void) pl.a_ammo3 = 1 - pl.a_ammo3; if (pl.a_ammo3) { - Weapons_SetGeomset("geomset 1 2\n"); Weapons_ViewAnimation(GLOCK_SILENCER); pl.w_attack_next = 3.3f; pl.w_idle_next = pl.w_attack_next; } else { - Weapons_SetGeomset("geomset 1 0\n"); Weapons_ViewAnimation(GLOCK_HOLSTER); pl.w_attack_next = 0.94f; pl.w_idle_next = pl.w_attack_next; } + /* toggle silencer on client */ +#ifdef CSQC + + if (pl.a_ammo3) { + Weapons_SetGeomset("geomset 1 2\n"); + } else { + Weapons_SetGeomset("geomset 1 0\n"); + } +#endif } void w_glock_reload(void)