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

neither thick nor thin is just right

Browse source
This commit is contained in:
Albert Cahalan 2004-12-19 23:31:30 +00:00
parent 0cbd1307f6
commit ab76ffb8d1
2 changed files with 2 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/magic.h
View file

@ -33,9 +33,6 @@ enum {
MAGIC_CHALK, MAGIC_CHALK,
MAGIC_BLOCKS, MAGIC_BLOCKS,
MAGIC_THICK,
MAGIC_THIN,
MAGIC_NEGATIVE, MAGIC_NEGATIVE,
MAGIC_TINT, MAGIC_TINT,
@ -70,9 +67,6 @@ const int magic_colors[] = {
COLORSEL_DISABLE, COLORSEL_DISABLE,
COLORSEL_DISABLE, COLORSEL_DISABLE,
COLORSEL_DISABLE,
COLORSEL_DISABLE,
COLORSEL_DISABLE, COLORSEL_DISABLE,
COLORSEL_ENABLE, // tint COLORSEL_ENABLE, // tint
@ -104,9 +98,6 @@ const char * const magic_names[NUM_MAGICS] = {
gettext_noop("Chalk"), gettext_noop("Chalk"),
gettext_noop("Blocks"), gettext_noop("Blocks"),
gettext_noop("Thick"),
gettext_noop("Thin"),
gettext_noop("Negative"), gettext_noop("Negative"),
gettext_noop("Tint"), 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 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 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 draw a negative."),
gettext_noop("Click and move the mouse around to change the picture's color."), 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/chalk.png",
DATA_PREFIX "images/magic/blocks.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/negative.png",
DATA_PREFIX "images/magic/tint.png", DATA_PREFIX "images/magic/tint.png",

6
src/tuxpaint.c
View file

@ -4028,10 +4028,6 @@ static void magic_draw(int x1, int y1, int x2, int y2, int button_down)
playsound(0, SND_NEGATIVE, 0); playsound(0, SND_NEGATIVE, 0);
else if (cur_magic == MAGIC_BLUR) else if (cur_magic == MAGIC_BLUR)
playsound(0, SND_BLUR, 0); 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)) else if (cur_magic == MAGIC_BLOCKS && ((rand() % 10) < 5))
playsound(0, SND_BLOCKS, 0); playsound(0, SND_BLOCKS, 0);
else if (cur_magic == MAGIC_FADE) 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) if (img_starter != NULL)
mirror_starter(); mirror_starter();
} }
#if 0
else if (cur_magic == MAGIC_THIN || cur_magic == MAGIC_THICK) else if (cur_magic == MAGIC_THIN || cur_magic == MAGIC_THICK)
{ {
SDL_LockSurface(last); SDL_LockSurface(last);
@ -4758,6 +4755,7 @@ static void blit_magic(int x, int y, int button_down)
SDL_UnlockSurface(canvas); SDL_UnlockSurface(canvas);
SDL_UnlockSurface(last); SDL_UnlockSurface(last);
} }
#endif
} }
} }