From 48a9e1c5183613db816e9adecdf5584d61995c51 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Wed, 21 Dec 2022 20:14:12 -0800 Subject: [PATCH] more new var names --- library/include/modules/Renderer.h | 9 --------- library/modules/Screen.cpp | 10 ++++++---- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/library/include/modules/Renderer.h b/library/include/modules/Renderer.h index e01af17cd..864efd8c1 100644 --- a/library/include/modules/Renderer.h +++ b/library/include/modules/Renderer.h @@ -12,18 +12,9 @@ namespace DFHack { namespace Renderer { renderer_wrap *parent; renderer_wrap *child; - virtual void update_tile(int32_t x, int32_t y); - virtual void update_all(); - virtual void render(); - virtual void set_fullscreen(); - virtual void zoom(df::zoom_commands z); - virtual void resize(int32_t w, int32_t h); - virtual void grid_resize(int32_t w, int32_t h); virtual ~renderer_wrap() { // All necessary cleanup should be handled by RemoveRenderer() }; - virtual bool get_mouse_coords(int32_t *x, int32_t *y); - virtual bool uses_opengl(); }; /* TODO: we can't cat enabler->renderer to renderer_wrap and expect it to work diff --git a/library/modules/Screen.cpp b/library/modules/Screen.cpp index f3fce920a..c15a41afc 100644 --- a/library/modules/Screen.cpp +++ b/library/modules/Screen.cpp @@ -54,6 +54,7 @@ using namespace DFHack; #include "df/tile_page.h" #include "df/interfacest.h" #include "df/enabler.h" +#include "df/graphic_map_portst.h" #include "df/unit.h" #include "df/item.h" #include "df/job.h" @@ -116,10 +117,11 @@ bool Screen::inGraphicsMode() static bool doSetTile_default(const Pen &pen, int x, int y, bool map) { - auto dim = Screen::getWindowSize(); - if (x < 0 || x >= dim.x || y < 0 || y >= dim.y) - return false; - + df::graphic_map_portst *vp = gps->main_map_port; + if (x >= vp->clipx[0] && x <= vp->clipx[1] + && y >= vp->clipy[0] && y <= vp->clipy[1]) { + vp->screentexpos_interface[x + y*vp->dim_x] = pen.tile; + } // TODO: understand how this changes for v50 /* size_t index = ((x * gps->dimy) + y);