vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Fixed compiling against the latest entity-codebase

Browse source
This commit is contained in:
Marco Cawthorne 2020-03-24 07:26:49 +01:00
parent 20c6a2d508
commit f1190cd282
21 changed files with 91 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/client/defs.h
View file

@ -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;

1
src/client/entry.c
View file

@ -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");

2
src/gs-entbase/client/env_cubemap.cpp
View file

@ -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

2
src/gs-entbase/client/env_glow.cpp
View file

@ -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.

2
src/gs-entbase/client/env_sound.cpp
View file

@ -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

2
src/gs-entbase/client/env_soundscape.cpp
View file

@ -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.

10
src/gs-entbase/client/func_lod.cpp
View file

@ -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

20
src/gs-entbase/client/func_physbox.cpp
View file

@ -1,4 +1,24 @@
/*
* Copyright (c) 2016-2019 Marco Hladik <marco@icculus.org>
*
* 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;

2
src/gs-entbase/client/point_message.cpp
View file

@ -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.

2
src/gs-entbase/client/prop_dynamic.cpp
View file

@ -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.

3
src/gs-entbase/client/prop_rope.cpp
View file

@ -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.

2
src/gs-entbase/client/sky_camera.cpp
View file

@ -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.

2
src/gs-entbase/server/ambient_generic.cpp
View file

@ -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.

2
src/gs-entbase/server/env_fade.cpp
View file

@ -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.

2
src/gs-entbase/server/env_shake.cpp
View file

@ -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.

13
src/gs-entbase/server/func_breakable.cpp
View file

@ -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).

20
src/menu-fn/master.cpp
View file

@ -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");

4
src/shared/hunger/w_ap9.c
View file

@ -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,

1
src/shared/hunger/w_chaingun.c
View file

@ -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");
}

8
src/shared/hunger/w_flame.c
View file

@ -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,

11
src/shared/hunger/w_glock.c
View file

@ -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)