From 6248e11d0adafddcbdb437bdbf1318c8a15b25b7 Mon Sep 17 00:00:00 2001
From: William Kendrick <wkendrick@users.sourceforge.net>
Date: Sun, 12 Dec 2004 10:55:08 +0000
Subject: [PATCH] Activated new Magic Tool sound effects.

---
 docs/AUTHORS.txt |  6 +++++-
 src/sounds.h     | 10 +++++++++-
 src/tuxpaint.c   |  9 ++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/docs/AUTHORS.txt b/docs/AUTHORS.txt
index 4beb503d2..2fcc2da6b 100644
--- a/docs/AUTHORS.txt
+++ b/docs/AUTHORS.txt
@@ -7,7 +7,7 @@ bill@newbreedsoftware.com
 http://www.newbreedsoftware.com/tuxpaint/
 
 
-June 17, 2002 - December 10, 2004
+June 17, 2002 - December 12, 2004
 
 
 * Design and Coding:
@@ -68,6 +68,10 @@ June 17, 2002 - December 10, 2004
     * Blur - Microphone against mousepad.
     * Chalk - Microphone against head of hair.
     * Fade - Squeaky frog.
+    * Smudge - Squishy mouth noise.
+  
+  * Cartoon
+    * "cartoon6.wav" from http://www.grsites.com/
     
   * Many others taken from various sources on the web.
 
diff --git a/src/sounds.h b/src/sounds.h
index 7b1b0e8db..c6d5792d5 100644
--- a/src/sounds.h
+++ b/src/sounds.h
@@ -8,7 +8,7 @@
   bill@newbreedsoftware.com
   http://www.newbreedsoftware.com/tuxpaint/
 
-  June 15, 2002 - December 19, 2002
+  June 15, 2002 - December 12, 2004
 */
 
 
@@ -44,7 +44,11 @@ enum {
   SND_BLUR,          /* Magic blur */
   SND_BLOCKS,        /* Magic blocks */
   SND_FADE,          /* Magic fade */
+  SND_DARKEN,        /* Magic darken */
   SND_RAINBOW,       /* Magic rainbow */
+  SND_SMUDGE,        /* Magic smudge */
+  SND_TINT,          /* Magic tint */
+  SND_CARTOON,       /* Magic cartoon */
   SND_KEYCLICK,      /* Text tool keyboard click feedback */
   SND_RETURN,        /* Text tool carriage return sound */
   SND_SHRINK,        /* Stamp shrink */
@@ -84,7 +88,11 @@ const char * const sound_fnames[NUM_SOUNDS] = {
   DATA_PREFIX "sounds/blur.wav",
   DATA_PREFIX "sounds/blocks.wav",
   DATA_PREFIX "sounds/fade.wav",
+  DATA_PREFIX "sounds/darken.wav",
   DATA_PREFIX "sounds/rainbow.wav",
+  DATA_PREFIX "sounds/smudge.wav",
+  DATA_PREFIX "sounds/tint.wav",
+  DATA_PREFIX "sounds/cartoon.wav",
   DATA_PREFIX "sounds/keyclick.wav",
   DATA_PREFIX "sounds/return.wav",
   DATA_PREFIX "sounds/shrink.wav",
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index d1b083901..377b33e4c 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -4059,12 +4059,19 @@ static void magic_draw(int x1, int y1, int x2, int y2, int button_down)
     playsound(0, SND_BLOCKS, 0);
   else if (cur_magic == MAGIC_FADE)
     playsound(0, SND_FADE, 0);
+  else if (cur_magic == MAGIC_DARKEN)
+    playsound(0, SND_DARKEN, 0);
   else if (cur_magic == MAGIC_RAINBOW)
     playsound(0, SND_RAINBOW, 0);
+  else if (cur_magic == MAGIC_SMUDGE)
+    playsound(0, SND_SMUDGE, 0);
+  else if (cur_magic == MAGIC_CARTOON)
+    playsound(0, SND_CARTOON, 0);
+  else if (cur_magic == MAGIC_TINT)
+    playsound(0, SND_TINT, 0);
 
   /* FIXME: Need sounds for:
      Smudge
-     Darken
      Tint
      Cartoon */