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

Gamerules: exception for friendlyfire when it comes to self

Browse source 
point_message: make messages appear through entities, as they may be translucent.
Fixed a minor warning.
This commit is contained in:
Marco Cawthorne 2022-04-21 18:50:21 -07:00
parent 8037f2d58b
commit 7395b8d421
Signed by: eukara
GPG key ID: C196CD8BA993248A
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -77,7 +77,7 @@ PointMessage_Visible(vector p1, vector p2, vector ang)
fov = delta * v_forward;
if (fov > 0.3) {
traceline(p2, p1, TRUE, self);
traceline(p2, p1, MOVE_WORLDONLY, self);
if (trace_fraction == 1.0) {
return (1);
}

1
src/server/gamerules.qc
View file

@ -214,6 +214,7 @@ CGameRules::DamageApply(entity t, entity c, float dmg, int w, damageType_t type)
/* friendly fire */
if (autocvar_sv_friendlyFire == false)
if (t != c)
if (IsTeamPlay()) {
if (t.flags & FL_CLIENT && c.flags & FL_CLIENT)
if (t.team == c.team)

2
src/shared/spectator.qc
View file

@ -365,7 +365,7 @@ spectator::SpectatorTrackPlayer(void)
if (b && b.classname == "player")
if (b.IsFakeSpectator()) {
b = world;
b = 0;
spec_mode = SPECMODE_FREE;
InputNext();
}