use the new function signature too

myk002 · myk002 · commit c8ec4f246cfc · 2024-03-25T09:23:59.000-07:00
diff --git a/plugins/devel/color-dfhack-text.cpp b/plugins/devel/color-dfhack-text.cpp
@@ -39,7 +39,7 @@ bool color_text_tile(const Screen::Pen &pen, int x, int y, bool map, int32_t * d
         pen2.bg = color;
         pen2.bold = true;
     }
-    return color_text_hook.next()(pen2, x, y, map);
+    return color_text_hook.next()(pen2, x, y, map, texpos_field);
 }
 
 bool aaaaa_set_tile(const Screen::Pen &pen, int x, int y, bool map, int32_t * df::graphic_viewportst::*texpos_field);
@@ -51,15 +51,15 @@ bool aaaaa_set_tile(const Screen::Pen &pen, int x, int y, bool map, int32_t * df
         pen2.ch = 'A';
     else if (pen.ch >= 'a' && pen.ch <= 'z')
         pen2.ch = 'a';
-    return aaaaa_set_tile_hook.next()(pen2, x, y, map);
+    return aaaaa_set_tile_hook.next()(pen2, x, y, map, texpos_field);
 }
 
 bool shift_set_tile(const Screen::Pen &pen, int x, int y, bool map, int32_t * df::graphic_viewportst::*texpos_field);
 GUI_HOOK_CALLBACK(Screen::Hooks::set_tile, shift_set_tile_hook, shift_set_tile);
 bool shift_set_tile(const Screen::Pen &pen, int x, int y, bool map, int32_t * df::graphic_viewportst::*texpos_field = NULL)
 {
     x = (x + 1) % gps->dimx;
-    return shift_set_tile_hook.next()(pen, x, y, map);
+    return shift_set_tile_hook.next()(pen, x, y, map, texpos_field);
 }
 
 DFhackCExport command_result plugin_enable (color_ostream &out, bool enable)

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ bool color_text_tile(const Screen::Pen &pen, int x, int y, bool map, int32_t * d`
`39`	`39`	`pen2.bg = color;`
`40`	`40`	`pen2.bold = true;`
`41`	`41`	`}`
`42`		`- return color_text_hook.next()(pen2, x, y, map);`
	`42`	`+ return color_text_hook.next()(pen2, x, y, map, texpos_field);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`bool aaaaa_set_tile(const Screen::Pen &pen, int x, int y, bool map, int32_t * df::graphic_viewportst::*texpos_field);`
`@@ -51,15 +51,15 @@ bool aaaaa_set_tile(const Screen::Pen &pen, int x, int y, bool map, int32_t * df`
`51`	`51`	`pen2.ch = 'A';`
`52`	`52`	`else if (pen.ch >= 'a' && pen.ch <= 'z')`
`53`	`53`	`pen2.ch = 'a';`
`54`		`- return aaaaa_set_tile_hook.next()(pen2, x, y, map);`
	`54`	`+ return aaaaa_set_tile_hook.next()(pen2, x, y, map, texpos_field);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`bool shift_set_tile(const Screen::Pen &pen, int x, int y, bool map, int32_t * df::graphic_viewportst::*texpos_field);`
`58`	`58`	`GUI_HOOK_CALLBACK(Screen::Hooks::set_tile, shift_set_tile_hook, shift_set_tile);`
`59`	`59`	`bool shift_set_tile(const Screen::Pen &pen, int x, int y, bool map, int32_t * df::graphic_viewportst::*texpos_field = NULL)`
`60`	`60`	`{`
`61`	`61`	`x = (x + 1) % gps->dimx;`
`62`		`- return shift_set_tile_hook.next()(pen, x, y, map);`
	`62`	`+ return shift_set_tile_hook.next()(pen, x, y, map, texpos_field);`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`DFhackCExport command_result plugin_enable (color_ostream &out, bool enable)`