From ab76ffb8d1627723075c5122a55f8e9c8a464340 Mon Sep 17 00:00:00 2001 From: Albert Cahalan Date: Sun, 19 Dec 2004 23:31:30 +0000 Subject: [PATCH] neither thick nor thin is just right --- src/magic.h | 15 --------------- src/tuxpaint.c | 6 ++---- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/src/magic.h b/src/magic.h index df12a0d97..a5ed47224 100644 --- a/src/magic.h +++ b/src/magic.h @@ -33,9 +33,6 @@ enum { MAGIC_CHALK, MAGIC_BLOCKS, - MAGIC_THICK, - MAGIC_THIN, - MAGIC_NEGATIVE, MAGIC_TINT, @@ -70,9 +67,6 @@ const int magic_colors[] = { COLORSEL_DISABLE, COLORSEL_DISABLE, - COLORSEL_DISABLE, - COLORSEL_DISABLE, - COLORSEL_DISABLE, COLORSEL_ENABLE, // tint @@ -104,9 +98,6 @@ const char * const magic_names[NUM_MAGICS] = { gettext_noop("Chalk"), gettext_noop("Blocks"), - gettext_noop("Thick"), - gettext_noop("Thin"), - gettext_noop("Negative"), gettext_noop("Tint"), @@ -139,9 +130,6 @@ const char * const magic_tips[NUM_MAGICS] = { gettext_noop("Click and move the mouse around to turn the picture into a chalk drawing."), gettext_noop("Click and move the mouse around to make the picture blocky."), - gettext_noop("Click and move the mouse to thicken the picture."), - gettext_noop("Click and move the mouse to thin the picture."), - gettext_noop("Click and move the mouse around to draw a negative."), gettext_noop("Click and move the mouse around to change the picture's color."), @@ -174,9 +162,6 @@ const char * const magic_img_fnames[NUM_MAGICS] = { DATA_PREFIX "images/magic/chalk.png", DATA_PREFIX "images/magic/blocks.png", - DATA_PREFIX "images/magic/thick.png", - DATA_PREFIX "images/magic/thin.png", - DATA_PREFIX "images/magic/negative.png", DATA_PREFIX "images/magic/tint.png", diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 0ccd8aa01..e6e7195fd 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -4028,10 +4028,6 @@ static void magic_draw(int x1, int y1, int x2, int y2, int button_down) playsound(0, SND_NEGATIVE, 0); else if (cur_magic == MAGIC_BLUR) playsound(0, SND_BLUR, 0); - else if (cur_magic == MAGIC_THICK) - playsound(0, SND_THICK, 0); - else if (cur_magic == MAGIC_THIN) - playsound(0, SND_THIN, 0); else if (cur_magic == MAGIC_BLOCKS && ((rand() % 10) < 5)) playsound(0, SND_BLOCKS, 0); else if (cur_magic == MAGIC_FADE) @@ -4706,6 +4702,7 @@ static void blit_magic(int x, int y, int button_down) if (img_starter != NULL) mirror_starter(); } +#if 0 else if (cur_magic == MAGIC_THIN || cur_magic == MAGIC_THICK) { SDL_LockSurface(last); @@ -4758,6 +4755,7 @@ static void blit_magic(int x, int y, int button_down) SDL_UnlockSurface(canvas); SDL_UnlockSurface(last); } +#endif } }