From ed606fb670db1042214d7d0285306c9779d8bdc6 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sat, 10 Jul 2021 18:30:46 +0900 Subject: [PATCH] [render] Fix some incorrect r_data references The render plugins have made a bit of a mess of getting at the data and thus it's a tad confusing how to get at it in different places. Really needs a proper cleanup :( --- libs/video/renderer/r_screen.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/video/renderer/r_screen.c b/libs/video/renderer/r_screen.c index f1701c7ba..f1ed6c349 100644 --- a/libs/video/renderer/r_screen.c +++ b/libs/video/renderer/r_screen.c @@ -182,7 +182,7 @@ SCR_CalcRefdef (void) R_SetVrect (&vrect, &refdef->vrect, r_data->lineadj); - view_setgeometry (vr_data.scr_view, refdef->vrect.x, refdef->vrect.y, + view_setgeometry (r_data->scr_view, refdef->vrect.x, refdef->vrect.y, refdef->vrect.width, refdef->vrect.height); // notify the refresh of the change @@ -265,7 +265,7 @@ SCR_DrawRam (void) return; //FIXME view - r_funcs->Draw_Pic (vr_data.scr_view->xpos + 32, vr_data.scr_view->ypos, + r_funcs->Draw_Pic (r_data->scr_view->xpos + 32, r_data->scr_view->ypos, scr_ram); } @@ -287,7 +287,7 @@ SCR_DrawTurtle (void) return; //FIXME view - r_funcs->Draw_Pic (vr_data.scr_view->xpos, vr_data.scr_view->ypos, + r_funcs->Draw_Pic (r_data->scr_view->xpos, r_data->scr_view->ypos, scr_turtle); }