diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 8f4117d9f..e5c12f476 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -31,10 +31,9 @@ https://tuxpaint.org/ + Closes https://sourceforge.net/p/tuxpaint/feature-requests/260/ - * WIP "ASCII Typewriter", "ASCII Computer", & "ASCII Color Computer": + * "ASCII Typewriter", "ASCII Computer", & "ASCII Color Computer": turn your drawing into ASCII art. - + TODO Icons - + Code by Bill Kendrick + + Code & icons by Bill Kendrick + Computer font: IBM CGA Adapter taken from "Typography in 16-bits: System fonts" diff --git a/magic/icons/ascii_color_computer.png b/magic/icons/ascii_color_computer.png new file mode 100644 index 000000000..3057874eb Binary files /dev/null and b/magic/icons/ascii_color_computer.png differ diff --git a/magic/icons/ascii_computer.png b/magic/icons/ascii_computer.png new file mode 100644 index 000000000..3bc3baf41 Binary files /dev/null and b/magic/icons/ascii_computer.png differ diff --git a/magic/icons/ascii_typewriter.png b/magic/icons/ascii_typewriter.png new file mode 100644 index 000000000..2c14c6bb6 Binary files /dev/null and b/magic/icons/ascii_typewriter.png differ diff --git a/magic/src/ascii.c b/magic/src/ascii.c index 04e1578ec..aa1afa89c 100644 --- a/magic/src/ascii.c +++ b/magic/src/ascii.c @@ -53,9 +53,10 @@ char * ascii_tool_names[NUM_TOOLS + 1] = { gettext_noop("Color Computer"), // special version of "computer" }; -char * ascii_tool_filenames[NUM_TOOLS] = { +char * ascii_tool_filenames[NUM_TOOLS + 1] = { "typewriter", "computer", + "color_computer", }; static Mix_Chunk *ascii_snd[NUM_TOOLS]; @@ -151,6 +152,7 @@ int ascii_init(magic_api * api, Uint8 disabled_features ATTRIBUTE_UNUSED, Uint8 ascii_bitmap[i] = NULL; } + /* (N.B. Computer & Color Computer share sound & bitmap) */ for (i = 0; i < NUM_TOOLS; i++) { /* Load our sound */ @@ -308,9 +310,7 @@ SDL_Surface *ascii_get_icon(magic_api * api, int which) { char fname[1024]; - /* FIXME */ - snprintf(fname, sizeof(fname), "%ssounds/magic/ascii-icon-%s.ogg", api->data_directory, ascii_tool_filenames[which]); - snprintf(fname, sizeof(fname), "%simages/magic/xor.png", api->data_directory); + snprintf(fname, sizeof(fname), "%simages/magic/ascii_%s.png", api->data_directory, ascii_tool_filenames[which]); return (IMG_Load(fname)); }