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

Remove miscframe altogether.

Browse source 
Miscframes are coupled to renderframes and are just checking for
renderer changes (very cheap) and advancing CD audio if implemented.
There's no reason not to that at every frame.
This commit is contained in:
Yamagi Burmeister 2017-09-09 09:39:56 +02:00
parent eb4fdb56de
commit e1ec177dbe
3 changed files with 6 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/client/cl_main.c
View file

@ -702,8 +702,7 @@ CL_UpdateWindowedMouse(void)
}
void
CL_Frame(int packetdelta, int renderdelta, int miscdelta, int timedelta,
qboolean packetframe, qboolean renderframe, qboolean miscframe)
CL_Frame(int packetdelta, int renderdelta, int timedelta, qboolean packetframe, qboolean renderframe)
{
static int lasttimecalled;
@ -778,11 +777,7 @@ CL_Frame(int packetdelta, int renderdelta, int miscdelta, int timedelta,
if (renderframe)
{
if (miscframe)
{
VID_CheckChanges();
}
VID_CheckChanges();
CL_PredictMovement();
if (!cl.refresh_prepped && (cls.state == ca_active))
@ -807,10 +802,7 @@ CL_Frame(int packetdelta, int renderdelta, int miscdelta, int timedelta,
S_Update(cl.refdef.vieworg, cl.v_forward, cl.v_right, cl.v_up);
#ifdef CDA
if (miscframe)
{
CDAudio_Update();
}
CDAudio_Update();
#endif
/* advance local effects for next frame */

24
src/common/frame.c
View file

@ -212,9 +212,6 @@ Qcommon_Frame(int msec)
// Time since last renderframe in microsec.
static int renderdelta = 1000000;
// Time since last misc. frame in microsec.
static int miscdelta = 100000;
// Accumulated time since last client run.
static int clienttimedelta = 0;
@ -234,11 +231,6 @@ Qcommon_Frame(int msec)
microseconds. */
qboolean renderframe = true;
/* A miscframe runs several maintenance task like
loading sound samples for the background music.
An interval of 100.000 microseconds is enough. */
qboolean miscframe = true;
/* In case of ERR_DROP we're jumping here. Don't know
if that' really save but it seems to work. So leave
@ -327,7 +319,6 @@ Qcommon_Frame(int msec)
// Calculate timings.
packetdelta += msec;
renderdelta += msec;
miscdelta += msec;
clienttimedelta += msec;
servertimedelta += msec;
@ -341,18 +332,12 @@ Qcommon_Frame(int msec)
// Render frames.
if (renderdelta < (1000000.0f / rfps)) {
renderframe = false;
// Misc. frames.
if (miscdelta < 100000.0f) {
miscframe = false;
}
}
} else {
// Cap frames at target framerate.
if (renderdelta < (1000000.0f / rfps)) {
renderframe = false;
packetframe = false;
miscframe = false;
}
}
}
@ -394,9 +379,8 @@ Qcommon_Frame(int msec)
// Run the client frame.
if (packetframe || renderframe || miscframe) {
CL_Frame(packetdelta, renderdelta, miscdelta, clienttimedelta,
packetframe, renderframe, miscframe);
if (packetframe || renderframe) {
CL_Frame(packetdelta, renderdelta, clienttimedelta, packetframe, renderframe);
clienttimedelta = 0;
}
@ -426,10 +410,6 @@ Qcommon_Frame(int msec)
if (renderframe) {
renderdelta = 0;
}
if (miscframe) {
miscdelta = 0;
}
}
#else
void

3
src/common/header/common.h
View file

@ -779,8 +779,7 @@ void Sys_RedirectStdout(void);
void CL_Init(void);
void CL_Drop(void);
void CL_Shutdown(void);
void CL_Frame(int packetdelta, int renderdelta, int miscdelta, int timedelta, qboolean packetframe, qboolean renderframe,
qboolean miscframe);
void CL_Frame(int packetdelta, int renderdelta, int timedelta, qboolean packetframe, qboolean renderframe);
void Con_Print(char *text);
void SCR_BeginLoadingPlaque(void);