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

Some minor spectate input code cleanup, make it so that we cache the last

Browse source 
valid player position so we don't get warped to [0,0,0] when a player being
tracked dies.
This commit is contained in:
Marco Cawthorne 2021-03-27 07:50:40 +01:00
parent ab355d6a52
commit 08a4080c66
2 changed files with 29 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/shared/spectator.h
View file

@ -27,13 +27,15 @@ class spectator
float spec_mode; float spec_mode_net;
float spec_flags; float spec_flags_net;
vector spec_org;
int sequence;
void(void) spectator;
virtual void(void) playernext;
virtual void(void) playerprevious;
virtual void(void) modeswitch;
virtual void(void) InputNext;
virtual void(void) InputPrevious;
virtual void(void) InputMode;
virtual void(void) PreFrame;
virtual void(void) PostFrame;

39
src/shared/spectator.qc
View file

@ -26,18 +26,11 @@ void
spectator::Input(void)
{
if (input_buttons & INPUT_BUTTON0) {
playernext();
InputNext();
} else if (input_buttons & INPUT_BUTTON3) {
playerprevious();
InputPrevious();
} else if (input_buttons & INPUT_BUTTON2) {
if (spec_flags & GF_SEMI_TOGGLED)
return;
spec_mode++;
if (spec_mode > SPECMODE_FIRSTPERSON)
spec_mode = SPECMODE_FREE;
spec_flags |= GF_SEMI_TOGGLED;
InputMode();
} else {
spec_flags &= ~GF_SEMI_TOGGLED;
}
@ -156,7 +149,7 @@ spectator::predraw(void)
#endif
void
spectator::playernext(void)
spectator::InputNext(void)
{
if (spec_flags & GF_SEMI_TOGGLED)
return;
@ -211,7 +204,7 @@ spectator::playernext(void)
}
void
spectator::playerprevious(void)
spectator::InputPrevious(void)
{
if (spec_flags & GF_SEMI_TOGGLED)
return;
@ -268,9 +261,17 @@ spectator::playerprevious(void)
}
void
spectator::modeswitch(void)
spectator::InputMode(void)
{
if (spec_flags & GF_SEMI_TOGGLED)
return;
spec_mode++;
if (spec_mode > SPECMODE_FIRSTPERSON)
spec_mode = SPECMODE_FREE;
spec_flags |= GF_SEMI_TOGGLED;
}
void
@ -320,7 +321,15 @@ spectator::PreFrame(void)
#else
b = edict_num(spec_ent);
#endif
setorigin(this, b.origin);
/* if the ent is dead... or not available in this current frame
just warp to the last 'good' one */
if (b) {
setorigin(this, b.origin);
spec_org = b.origin;
} else {
setorigin(this, spec_org);
}
}
}