MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

comment out problematic code in Screen.cpp

develop
Myk Taylor 2022-12-16 11:26:05 -08:00 committed by Kelly Kinkade
parent 55351951f0
commit ccc9e976e2
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library/include/modules/Screen.h
Unescape Escape View File

@ -336,6 +336,7 @@ namespace DFHack
virtual void logic(); virtual void logic();
virtual void render(); virtual void render();
virtual void resize(int w, int h) { return; }
virtual int8_t movies_okay() { return 1; } virtual int8_t movies_okay() { return 1; }
virtual bool key_conflict(df::interface_key key); virtual bool key_conflict(df::interface_key key);

12
library/modules/Screen.cpp
Unescape Escape View File

@ -79,11 +79,12 @@ using std::string;
// returns text grid coordinates, even if the game map is scaled differently // returns text grid coordinates, even if the game map is scaled differently
df::coord2d Screen::getMousePos() df::coord2d Screen::getMousePos()
{ {
int32_t x = Renderer::GET_MOUSE_COORDS_SENTINEL, y = (int32_t)true; int32_t a, b, r, f;
if (!enabler || !enabler->renderer->get_mouse_coords(&x, &y)) { if (!enabler || !enabler->renderer->get_mouse_coords(&a, &b, &r, &f)) {
return df::coord2d(-1, -1); return df::coord2d(-1, -1);
} }
return df::coord2d(x, y); std::cerr << "a,b,r,f = " << a << ", " << b << ", " << r << ", " << f << std::endl;
return df::coord2d(-1, -1);
} }
df::coord2d Screen::getWindowSize() df::coord2d Screen::getWindowSize()
@ -108,6 +109,7 @@ static bool doSetTile_default(const Pen &pen, int x, int y, bool map)
if (x < 0 || x >= dim.x || y < 0 || y >= dim.y) if (x < 0 || x >= dim.x || y < 0 || y >= dim.y)
return false; return false;
/* TODO: understand how this changes for v50
int index = ((x * gps->dimy) + y); int index = ((x * gps->dimy) + y);
auto screen = gps->screen + index*4; auto screen = gps->screen + index*4;
screen[0] = uint8_t(pen.ch); screen[0] = uint8_t(pen.ch);
@ -119,7 +121,7 @@ static bool doSetTile_default(const Pen &pen, int x, int y, bool map)
gps->screentexpos_grayscale[index] = (pen.tile_mode == Screen::Pen::TileColor); gps->screentexpos_grayscale[index] = (pen.tile_mode == Screen::Pen::TileColor);
gps->screentexpos_cf[index] = pen.tile_fg; gps->screentexpos_cf[index] = pen.tile_fg;
gps->screentexpos_cbr[index] = pen.tile_bg; gps->screentexpos_cbr[index] = pen.tile_bg;
*/
return true; return true;
} }
@ -143,6 +145,7 @@ static Pen doGetTile_default(int x, int y, bool map)
if (x < 0 || x >= dim.x || y < 0 || y >= dim.y) if (x < 0 || x >= dim.x || y < 0 || y >= dim.y)
return Pen(0,0,0,-1); return Pen(0,0,0,-1);
/* TODO: understand how this changes for v50
int index = x*dim.y + y; int index = x*dim.y + y;
auto screen = gps->screen + index*4; auto screen = gps->screen + index*4;
if (screen[3] & 0x80) if (screen[3] & 0x80)
@ -168,6 +171,7 @@ static Pen doGetTile_default(int x, int y, bool map)
} }
return pen; return pen;
*/ return Pen(0,0,0,-1);
} }
GUI_HOOK_DEFINE(Screen::Hooks::get_tile, doGetTile_default); GUI_HOOK_DEFINE(Screen::Hooks::get_tile, doGetTile_default);