diff --git a/include/r_screen.h b/include/r_screen.h index 4fb5e91cd..7955fdd3d 100644 --- a/include/r_screen.h +++ b/include/r_screen.h @@ -64,8 +64,6 @@ extern struct qpic_s *scr_turtle; extern int clearconsole; extern int clearnotify; -extern viddef_t vid; // global video state - extern vrect_t *pconupdate; extern vrect_t scr_vrect; diff --git a/libs/video/renderer/r_screen.c b/libs/video/renderer/r_screen.c index a6d129674..6eb307229 100644 --- a/libs/video/renderer/r_screen.c +++ b/libs/video/renderer/r_screen.c @@ -104,8 +104,6 @@ qpic_t *scr_turtle; int clearconsole; -viddef_t vid; // global video state - vrect_t *pconupdate; vrect_t scr_vrect; @@ -365,6 +363,5 @@ SCR_Init (void) scr_ram = vr_funcs->Draw_PicFromWad ("ram"); scr_turtle = vr_funcs->Draw_PicFromWad ("turtle"); - vid = *vr_data.vid; // cache scr_initialized = true; } diff --git a/libs/video/renderer/vid_common.c b/libs/video/renderer/vid_common.c index 5a2cd9d43..74a1140b0 100644 --- a/libs/video/renderer/vid_common.c +++ b/libs/video/renderer/vid_common.c @@ -34,6 +34,8 @@ #include "mod_internal.h" #include "r_internal.h" +viddef_t vid; // global video state + vid_render_data_t vid_render_data = { &vid, &r_refdef, &scr_vrect, 0, 0, 0,