yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-01 05:30:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make "wait" in scripts wait for >= 17ms, fix #591

Browse source 
so it waits for about the time of one frame at 60fps, but independently
of the actual framerate.
Without this fix, wait is broken unless vsync is on, because
CBuf_Execute() is called about 1000 times per second by Qcommon_Frame(),
even if no render- or packet-frame is executed.
(vsync "fixes" this because then we have a real wait at the end of each
 renderframe)
This commit is contained in:
Daniel Gibson 2020-08-23 17:21:20 +02:00
parent 634748a5b5
commit 37a5ca8a8d
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/common/cmdparser.c
View file

@ -50,7 +50,7 @@ typedef struct cmdalias_s
char retval[256];
int alias_count; /* for detecting runaway loops */
cmdalias_t *cmd_alias;
qboolean cmd_wait;
int cmd_wait;
static int cmd_argc;
static int cmd_argc;
static char *cmd_argv[MAX_STRING_TOKENS];
@ -68,7 +68,7 @@ char defer_text_buf[32768];
void
Cmd_Wait_f(void)
{
cmd_wait = true;
cmd_wait = Sys_Milliseconds();
}
void
@ -173,6 +173,17 @@ Cbuf_Execute(void)
char line[1024];
int quotes;
if(cmd_wait > 0)
{
// make sure that "wait" in scripts waits for ~16.66ms (1 frame at 60fps)
// regardless of framerate
if (Sys_Milliseconds() - cmd_wait <= 16)
{
return;
}
cmd_wait = 0;
}
alias_count = 0; /* don't allow infinite alias loops */
while (cmd_text.cursize)
@ -228,11 +239,10 @@ Cbuf_Execute(void)
/* execute the command line */
Cmd_ExecuteString(line);
if (cmd_wait)
if (cmd_wait > 0)
{
/* skip out while text still remains in buffer,
leaving it for next frame */
cmd_wait = false;
leaving it for after we're done waiting */
break;
}
}