From c6b79d49a47500bae40bf6956b93184ea8bfa298 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Thu, 10 Nov 2022 21:23:04 +0900 Subject: [PATCH] [client] Fix incorrect function component setup Need to pass the address of the pointer :/ --- include/QF/screen.h | 4 ++-- libs/client/cl_screen.c | 7 ++++--- libs/video/renderer/r_graph.c | 4 ++-- qw/source/cl_ngraph.c | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/QF/screen.h b/include/QF/screen.h index d5e7bd81f..e462b8269 100644 --- a/include/QF/screen.h +++ b/include/QF/screen.h @@ -52,7 +52,7 @@ extern int scr_copytop; extern qboolean scr_skipupdate; struct view_pos_s; -void R_TimeGraph (struct view_pos_s abs); -void R_ZGraph (struct view_pos_s abs); +void R_TimeGraph (struct view_pos_s abs, struct view_pos_s len); +void R_ZGraph (struct view_pos_s abs, struct view_pos_s len); #endif//__QF_screen_h diff --git a/libs/client/cl_screen.c b/libs/client/cl_screen.c index e48f6236e..84fdde018 100644 --- a/libs/client/cl_screen.c +++ b/libs/client/cl_screen.c @@ -220,15 +220,16 @@ CL_Init_Screen (void) View_SetPos (timegraph_view, 0, 0); View_SetLen (timegraph_view, r_data->vid->width, 100); View_SetGravity (timegraph_view, grav_southwest); - Ent_SetComponent (timegraph_view.id, hud_func, timegraph_view.reg, - R_TimeGraph); + void *rtg = R_TimeGraph; + Ent_SetComponent (timegraph_view.id, hud_func, timegraph_view.reg, &rtg); View_SetVisible (timegraph_view, r_timegraph); zgraph_view = View_New (hud_registry, cl_screen_view); View_SetPos (zgraph_view, 0, 0); View_SetLen (zgraph_view, r_data->vid->width, 100); View_SetGravity (zgraph_view, grav_southwest); - Ent_SetComponent (zgraph_view.id, hud_func, zgraph_view.reg, R_ZGraph); + void *rzg = R_ZGraph; + Ent_SetComponent (zgraph_view.id, hud_func, zgraph_view.reg, &rzg); View_SetVisible (zgraph_view, r_zgraph); const char *name = "gfx/loading.lmp"; diff --git a/libs/video/renderer/r_graph.c b/libs/video/renderer/r_graph.c index c42736210..a6f051353 100644 --- a/libs/video/renderer/r_graph.c +++ b/libs/video/renderer/r_graph.c @@ -50,7 +50,7 @@ int graphval; Performance monitoring tool */ void -R_TimeGraph (view_pos_t abs) +R_TimeGraph (view_pos_t abs, view_pos_t len) { static int timex; int a; @@ -85,7 +85,7 @@ R_TimeGraph (view_pos_t abs) } void -R_ZGraph (view_pos_t abs) +R_ZGraph (view_pos_t abs, view_pos_t len) { int w; static int height[256]; diff --git a/qw/source/cl_ngraph.c b/qw/source/cl_ngraph.c index 423d092a1..f4ec199dc 100644 --- a/qw/source/cl_ngraph.c +++ b/qw/source/cl_ngraph.c @@ -157,7 +157,7 @@ void CL_NetGraph_Init (void) { cl_netgraph_view = View_New (hud_registry, cl_screen_view); - View_SetPos (cl_netgraph_view, 0, hud_sb_lines); + View_SetPos (cl_netgraph_view, 0, 64); View_SetLen (cl_netgraph_view, NET_TIMINGS + 16, cl_netgraph_height + 25); View_SetGravity (cl_netgraph_view, grav_southwest); void *f = CL_NetGraph;