fn/ts
fn/ts
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

respawn countdown reorganization

Browse source
This commit is contained in:
Chris Dawalt 2021-10-03 06:34:20 -04:00
parent b5e7cf4bbf
commit 3c3715d77a
2 changed files with 24 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/shared/input.qc
View file

@ -440,38 +440,6 @@ void PreSpawn_Input(void){
}
// show a printout of how long until the player can click to spawn.
// TODO - use our own system instead to use a larger font, and the same one
// used for the buymenu buttons, most things seem to do that.
// Also, any 'Using New Config' centerprint will be overwritten by this instantly,
// so there should probably be a check to let that one appear independently of this
// countdown and below if both need to be shown.
if(pl.iState == PLAYER_STATE::NOCLIP && pl.displayMinimumRespawnTimeCountdown){
int roundedMinimumRespawnTime = (int)ceil(getstatf(STAT_MINIMUMRESPAWNTIME));
if(roundedMinimumRespawnTime != 0){
CSQC_Parse_CenterPrint(sprintf("%i", roundedMinimumRespawnTime));
}else{
// last one.
pl.displayMinimumRespawnTimeCountdown = FALSE;
CSQC_Parse_CenterPrint("Press fire to play!");
}
}
/*
if(
((input_buttons & INPUT_BUTTON0) && pSeatLocal->m_flBlockSpawnInputTime > time) ||
pSeat->m_flInputBlockTime > time
)
{
pSeatLocal->m_flBlockSpawnInputTime = time + 0.20f;
pl.gflags |= GF_SEMI_TOGGLED;
return;
}
*/
}//PreSpawn_Input

24
src/shared/player.qc
View file

@ -1829,6 +1829,30 @@ player::preThink(void){
}// inventoryEquippedIndex
}// w_freeze_idle_next check
// show a printout of how long until the player can click to spawn.
// TODO - use our own system instead to use a larger font, and the same one
// used for the buymenu buttons, most things seem to do that.
// Also, any 'Using New Config' centerprint will be overwritten by this instantly,
// so there should probably be a check to let that one appear independently of this
// countdown and below if both need to be shown.
// ALSO, making the "iState == PLAYER_STATE::NOCLIP" check less strict.
// It is possible to stop this slightly early, but may as well send the
// "Press fire to play" anyway, not much earlier is allowed.
if(iState != PLAYER_STATE::DEAD_RECENT && displayMinimumRespawnTimeCountdown){
int roundedMinimumRespawnTime = (int)ceil(getstatf(STAT_MINIMUMRESPAWNTIME));
if(roundedMinimumRespawnTime != 0){
CSQC_Parse_CenterPrint(sprintf("%i", roundedMinimumRespawnTime));
}else{
// last one.
displayMinimumRespawnTimeCountdown = FALSE;
CSQC_Parse_CenterPrint("Press fire to play!");
}
}
preThinkShared();
}//preThink