diff options
| author | perepujal <perepujal> | 2011-09-19 22:11:48 (GMT) |
|---|---|---|
| committer | perepujal <perepujal> | 2011-09-19 22:11:48 (GMT) |
| commit | 1e1acec0b3b5a0fd8cbcd82ce899e03a1eef587d (patch) | |
| tree | 248cf166f35ce98f4b4f85840c5314eeeb9f2952 | |
| parent | 16c12e0a33f41b2d5f3c5e90ca20faec6ba355ec (diff) | |
Descriptions for magic tools that use the new MODE_PAINT_WITH_PREVIEW and MODE_ONECLICK were not showing.
| -rw-r--r-- | src/tuxpaint.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/tuxpaint.c b/src/tuxpaint.c index ceeb2f2..d4e9e6b 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -17846,7 +17846,7 @@ static void load_magic_plugins(void) } else { - int j, bit; + int j; for (i = 0; i < n; i++) { @@ -17857,14 +17857,23 @@ static void load_magic_plugins(void) magics[num_magics].avail_modes = magic_funcs[num_plugin_files].modes(magic_api_struct, i); - bit = 1; for (j = 0; j < MAX_MODES; j++) { - if (magics[num_magics].avail_modes & bit) - magics[num_magics].tip[j] = magic_funcs[num_plugin_files].get_description(magic_api_struct, i, bit); - else - magics[num_magics].tip[j] = NULL; - bit *= 2; + magics[num_magics].tip[j] = NULL; + if (j) + { + if (magics[num_magics].avail_modes & MODE_FULLSCREEN) + magics[num_magics].tip[j] = magic_funcs[num_plugin_files].get_description(magic_api_struct, i, MODE_FULLSCREEN); + } + else + { + if (magics[num_magics].avail_modes & MODE_PAINT) + magics[num_magics].tip[j] = magic_funcs[num_plugin_files].get_description(magic_api_struct, i, MODE_PAINT); + else if (magics[num_magics].avail_modes & MODE_ONECLICK) + magics[num_magics].tip[j] = magic_funcs[num_plugin_files].get_description(magic_api_struct, i, MODE_ONECLICK); + else if (magics[num_magics].avail_modes & MODE_PAINT_WITH_PREVIEW) + magics[num_magics].tip[j] = magic_funcs[num_plugin_files].get_description(magic_api_struct, i, MODE_PAINT_WITH_PREVIEW); + } } magics[num_magics].colors = magic_funcs[num_plugin_files].requires_colors(magic_api_struct, i); |