notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mend magic .sizes treated as a bool, instead of array

Browse source 
h/t Shin-ichi for reporting seeing warnings about

  warning: the comparison will always evaluate as 'true' for the address of 'sizes' will never be NULL

Magic tool ".sizes" was recently turned into an array (per-mode of the
Magic tool), but a few references forgot to account for that.

Corrected like so

e.g., from
  if (magics[magic_group][cur_thing].sizes)
to
  if (magics[magic_group][cur_thing].sizes[magic_modeint(magics[magic_group][cur_thing].mode)])
This commit is contained in:
Bill Kendrick 2023-06-21 22:39:21 -07:00
parent a094ec850d
commit 04d0116ae5
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/tuxpaint.c
View file

@ -3739,7 +3739,7 @@ static void mainloop(void)
if (magics[magic_group][cur_thing].colors)
magic_set_color();
if (magics[magic_group][cur_thing].sizes)
if (magics[magic_group][cur_thing].sizes[magic_modeint(magics[magic_group][cur_thing].mode)])
magic_set_size();
}
else if (cur_tool == TOOL_ERASER)
@ -4361,7 +4361,7 @@ static void mainloop(void)
if (magics[magic_group][cur_thing].colors)
magic_set_color();
if (magics[magic_group][cur_thing].sizes)
if (magics[magic_group][cur_thing].sizes[magic_modeint(magics[magic_group][cur_thing].mode)])
magic_set_size();
magic_switchin(canvas);
@ -5101,7 +5101,7 @@ static void mainloop(void)
if (magics[grp][cur].colors)
magic_set_color();
if (magics[grp][cur].sizes)
if (magics[grp][cur].sizes[magic_modeint(magics[grp][cur].mode)])
magic_set_size();
magic_switchin(canvas);