qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-29 07:32:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[nq,qw] Minimize differences in cl_screen.c

Browse source
This commit is contained in:
Bill Currie 2022-11-01 21:00:40 +09:00
parent e67b374fd4
commit efee9c87a9
4 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/r_local.h
View file

@ -299,7 +299,8 @@ struct dlight_s;
extern vec3_t lightspot; extern vec3_t lightspot;
void R_StoreEfrags (const efrag_t *ppefrag); struct efrag_s;
void R_StoreEfrags (const struct efrag_s *efrag);
void R_TimeRefresh_f (void); void R_TimeRefresh_f (void);
void R_PrintAliasStats (void); void R_PrintAliasStats (void);
void R_PrintTimes (void); void R_PrintTimes (void);

3
include/r_shared.h
View file

@ -163,6 +163,7 @@ typedef struct edge_s
extern float r_avertexnormals[NUMVERTEXNORMALS][3]; extern float r_avertexnormals[NUMVERTEXNORMALS][3];
extern vec3_t ambientcolor; extern vec3_t ambientcolor;
uint32_t SW_AddEntity (entity_t ent); struct entity_s;
uint32_t SW_AddEntity (struct entity_s ent);
#endif // _R_SHARED_H #endif // _R_SHARED_H

7
nq/source/cl_screen.c
View file

@ -130,13 +130,12 @@ scr_draw_views (void)
View_SetVisible (pause_view, scr_showpause && r_data->paused); View_SetVisible (pause_view, scr_showpause && r_data->paused);
View_SetVisible (ram_view, scr_showram && r_cache_thrash); View_SetVisible (ram_view, scr_showram && r_cache_thrash);
View_SetVisible (net_view, View_SetVisible (net_view, (!cls.demoplayback
(!cls.demoplayback && realtime - cl.last_servermessage >= 0.3)); && realtime - cl.last_servermessage >= 0.3));
View_SetVisible (loading_view, cl.loading); View_SetVisible (loading_view, cl.loading);
// FIXME cvar callbacks // FIXME cvar callbacks
View_SetVisible (timegraph_view, r_timegraph); View_SetVisible (timegraph_view, r_timegraph);
View_SetVisible (zgraph_view, r_zgraph); View_SetVisible (zgraph_view, r_zgraph);
} }
static SCR_Func scr_funcs_normal[] = { static SCR_Func scr_funcs_normal[] = {
@ -153,12 +152,14 @@ static SCR_Func scr_funcs_normal[] = {
static SCR_Func scr_funcs_intermission[] = { static SCR_Func scr_funcs_intermission[] = {
Sbar_IntermissionOverlay, Sbar_IntermissionOverlay,
Con_DrawConsole, Con_DrawConsole,
scr_draw_views,
0 0
}; };
static SCR_Func scr_funcs_finale[] = { static SCR_Func scr_funcs_finale[] = {
Sbar_FinaleOverlay, Sbar_FinaleOverlay,
Con_DrawConsole, Con_DrawConsole,
scr_draw_views,
0, 0,
}; };

10
qw/source/cl_screen.c
View file

@ -45,8 +45,8 @@
#include "QF/screen.h" #include "QF/screen.h"
#include "QF/plugin/console.h" #include "QF/plugin/console.h"
#include "QF/plugin/vid_render.h"
#include "QF/scene/entity.h"
#include "QF/scene/scene.h" #include "QF/scene/scene.h"
#include "QF/scene/transform.h" #include "QF/scene/transform.h"
#include "QF/ui/view.h" #include "QF/ui/view.h"
@ -56,7 +56,6 @@
#include "r_local.h" //FIXME for r_cache_thrash #include "r_local.h" //FIXME for r_cache_thrash
#include "client/hud.h" #include "client/hud.h"
#include "client/view.h"
#include "client/world.h" #include "client/world.h"
#include "qw/include/client.h" #include "qw/include/client.h"
@ -132,9 +131,12 @@ scr_draw_views (void)
View_SetVisible (pause_view, scr_showpause && r_data->paused); View_SetVisible (pause_view, scr_showpause && r_data->paused);
View_SetVisible (ram_view, scr_showram && r_cache_thrash); View_SetVisible (ram_view, scr_showram && r_cache_thrash);
View_SetVisible (net_view, View_SetVisible (net_view, (!cls.demoplayback
(!cls.demoplayback && realtime - cl.last_servermessage >= 0.3)); && realtime - cl.last_servermessage >= 0.3));
View_SetVisible (loading_view, cl.loading); View_SetVisible (loading_view, cl.loading);
// FIXME cvar callbacks
View_SetVisible (timegraph_view, r_timegraph);
View_SetVisible (zgraph_view, r_zgraph);
} }
static SCR_Func scr_funcs_normal[] = { static SCR_Func scr_funcs_normal[] = {