Merge branch 'master' into sdl2.0

This commit is contained in:
Pere Pujal i Carabantes 2021-10-07 00:15:27 +02:00
commit d42a255530
132 changed files with 5437 additions and 3391 deletions

View file

@ -562,8 +562,10 @@ void perspective_set_color(magic_api * api ATTRIBUTE_UNUSED, Uint8 r, Uint8 g, U
}
// Use colors:
int perspective_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
int perspective_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which)
{
if (which == TOOL_PANELS)
return 0;
return 1;
}