From 63bda5fa01d067dc12ba22f35d4191cac816a4fc Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Mon, 22 Feb 2016 18:57:29 +0100
Subject: Update the hair color if a hairstyle get changed (fix the Sdye
 Regulardye problem).

---
 npc/functions/barber.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'npc')

diff --git a/npc/functions/barber.txt b/npc/functions/barber.txt
index 9c75ffc3..bdcac83b 100644
--- a/npc/functions/barber.txt
+++ b/npc/functions/barber.txt
@@ -47,12 +47,14 @@ function	script	BarberChangeStyle	{
                 .@rand_hair = rand(1,29);
             } while (.@rand_hair == getlook (LOOK_HAIR));
             setlook LOOK_HAIR, .@rand_hair;
+            setlook LOOK_HAIR_COLOR, getlook (LOOK_HAIR_COLOR);
 
             break;
         case 30:
             break;
         default:
             setlook LOOK_HAIR, @menuret;
+            setlook LOOK_HAIR_COLOR, getlook (LOOK_HAIR_COLOR);
             break;
     }
     return;
@@ -82,7 +84,7 @@ function	script	BarberChangeColor	{
         rif(getlook (LOOK_HAIR_COLOR) !=  19, l("Forest Green")), 19,
         rif(getlook (LOOK_HAIR_COLOR) !=  20, l("Silver Grey")), 20,
         rif(getlook (LOOK_HAIR_COLOR) !=  21, l("Esperia Blue")), 21,
-        l("Surprise me")), 22,
+        l("Surprise me"), 22,
         l("Hmm, I'm fine for now, thank you."), 23;
 
     switch (@menuret)
-- 
cgit v1.2.3-70-g09d2