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

spectator: Several fixes to make spectating a bit more polished. Ignore fakespectators entirely, etc.

Browse source
This commit is contained in:
Marco Cawthorne 2022-04-18 15:53:15 -07:00
parent 069c59628d
commit bf00bfa60c
Signed by: eukara
GPG key ID: C196CD8BA993248A
2 changed files with 44 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/shared/damage.h
View file

@ -44,4 +44,4 @@ typedef enumflags
DMG_SKIP_RAGDOLL DMG_SKIP_RAGDOLL
} damageType_t; } damageType_t;
#define DMG_ACID DMG_CHEMICAL #define DMG_ACID DMG_CHEMICAL

55
src/shared/spectator.qc
View file

@ -182,6 +182,7 @@ spectator::InputNext(void)
float max_edict; float max_edict;
float sep = spec_ent; float sep = spec_ent;
float best = 0; float best = 0;
base_client cl;
max_edict = serverkeyfloat("sv_playerslots"); max_edict = serverkeyfloat("sv_playerslots");
@ -191,15 +192,20 @@ spectator::InputNext(void)
if (i <= sep && best == 0) { if (i <= sep && best == 0) {
f = edict_num(i); f = edict_num(i);
if (f && f.classname == "player" && f != this) { if (f && f.classname == "player" && f != this) {
best = i; cl = (base_client)f;
if (!cl.IsFakeSpectator())
best = i;
} }
} }
if (i > sep) { if (i > sep) {
f = edict_num(i); f = edict_num(i);
if (f && f.classname == "player" && f != this) { if (f && f.classname == "player" && f != this) {
best = i; cl = (base_client)f;
break; if (!cl.IsFakeSpectator()) {
best = i;
break;
}
} }
} }
} }
@ -234,6 +240,7 @@ spectator::InputPrevious(void)
float max_edict; float max_edict;
float sep = spec_ent; float sep = spec_ent;
float best = 0; float best = 0;
base_client cl;
max_edict = serverkeyfloat("sv_playerslots"); max_edict = serverkeyfloat("sv_playerslots");
@ -243,8 +250,12 @@ spectator::InputPrevious(void)
/* remember the first valid one here */ /* remember the first valid one here */
if (i >= sep && best == 0) { if (i >= sep && best == 0) {
f = edict_num(i); f = edict_num(i);
if (f && f.classname == "player") { if (f && f.classname == "player") {
best = i; cl = (base_client)f;
if (!cl.IsFakeSpectator())
best = i;
} }
} }
@ -252,8 +263,11 @@ spectator::InputPrevious(void)
if (i < sep) { if (i < sep) {
f = edict_num(i); f = edict_num(i);
if (f && f.classname == "player") { if (f && f.classname == "player") {
best = i; cl = (base_client)f;
break; if (!cl.IsFakeSpectator()) {
best = i;
break;
}
} }
} }
} }
@ -278,11 +292,21 @@ spectator::InputMode(void)
if (spec_flags & SPECFLAG_BUTTON_RELEASED) if (spec_flags & SPECFLAG_BUTTON_RELEASED)
return; return;
crossprint("MODE\n"); base_client f;
spec_mode++; #ifdef CLIENT
f = (base_client)findfloat(world, ::entnum, spec_ent);
#else
f = (base_client)edict_num(spec_ent);
#endif
if (spec_mode > SPECMODE_FIRSTPERSON) if (f == this || f.classname != "player")
spec_mode = SPECMODE_FREE; spec_mode = SPECMODE_FREE;
else {
spec_mode++;
if (spec_mode > SPECMODE_FIRSTPERSON)
spec_mode = SPECMODE_FREE;
}
spec_flags |= SPECFLAG_BUTTON_RELEASED; spec_flags |= SPECFLAG_BUTTON_RELEASED;
} }
@ -331,14 +355,21 @@ void
spectator::SpectatorTrackPlayer(void) spectator::SpectatorTrackPlayer(void)
{ {
if (spec_mode == SPECMODE_THIRDPERSON || spec_mode == SPECMODE_FIRSTPERSON ) { if (spec_mode == SPECMODE_THIRDPERSON || spec_mode == SPECMODE_FIRSTPERSON ) {
entity b; base_client b;
#ifdef CLIENT #ifdef CLIENT
b = findfloat(world, ::entnum, spec_ent); b = (base_client)findfloat(world, ::entnum, spec_ent);
#else #else
b = edict_num(spec_ent); b = (base_client)edict_num(spec_ent);
#endif #endif
if (b && b.classname == "player")
if (b.IsFakeSpectator()) {
b = world;
spec_mode = SPECMODE_FREE;
InputNext();
}
/* if the ent is dead... or not available in this current frame /* if the ent is dead... or not available in this current frame
just warp to the last 'good' one */ just warp to the last 'good' one */
if (b) { if (b) {