From d4f105021aa5678c771b2a6b72ab50baa61799ce Mon Sep 17 00:00:00 2001
From: samuray22 <samuray22@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Wed, 28 Nov 2007 23:21:58 +0000
Subject: * Fixed problem in the Hair Dyer NPC. (bugreport:509)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11839 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 npc/Changelog.txt           |  2 ++
 npc/merchants/hair_dyer.txt | 38 ++++++++++++++++++++------------------
 2 files changed, 22 insertions(+), 18 deletions(-)

(limited to 'npc')

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 1cc4c9e2e..ea158965a 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
 Date		Added
 ======
+2007/11/28
+	* Fixed problem in the Hair Dyer NPC. (bugreport:509) [Samuray22]
 2007/11/27
 	* Corrected some broken warp points. (bugreport:497) [Samuray22]
 	* Corrected a bug on Sample Dynamic Shop. (bugreport:421) [Samuray22]
diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt
index 6b5cea10f..3914c6f38 100644
--- a/npc/merchants/hair_dyer.txt
+++ b/npc/merchants/hair_dyer.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //= Fully working
 //= 1.1 Bugfix: fixed missing menu label LEnd->M_End [Lupus]
 //= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 1.3 Fixed problem what "freezes" the NPC. (bugreport:509) [Samuray22]
 //============================================================ 
 
 prt_in,243,168,4	script	Jovovich	91,{
@@ -83,14 +84,14 @@ prt_in,243,168,4	script	Jovovich	91,{
 					}
 					else {
 						switch(.@headpalette) {
-						case 1: callsub S_NoDye,976,"yellow";
-						case 2: callsub S_NoDye,978,"violet";
-						case 3: callsub S_NoDye,979,"orange";
-						case 4: callsub S_NoDye,980,"green";
-						case 5: callsub S_NoDye,981,"blue";
-						case 6: callsub S_NoDye,982,"white"; 
-						case 7: callsub S_NoDye,983,"black";
-						Case 8: callsub S_NoDye,975,"red";
+						case 1: callsub S_NoDye,976,"yellow"; break;
+						case 2: callsub S_NoDye,978,"violet"; break;
+						case 3: callsub S_NoDye,979,"orange"; break;
+						case 4: callsub S_NoDye,980,"green"; break;
+						case 5: callsub S_NoDye,981,"blue"; break;
+						case 6: callsub S_NoDye,982,"white"; break;
+						case 7: callsub S_NoDye,983,"black"; break;
+						Case 8: callsub S_NoDye,975,"red"; break;
 						}
 						if (zeny < 1000) {
 							mes "[Hairdresser Jovovich]";
@@ -99,14 +100,14 @@ prt_in,243,168,4	script	Jovovich	91,{
 						}
 
 						switch(.@headpalette) {
-						case 1: delitem 976,1; //Lemon_Dyestuffs
-						case 2: delitem 978,1; //Violet_Dyestuffs
-						case 3: delitem 979,1; //Orange_Dyestuffs
-						case 4: delitem 980,1; //Darkgreen_Dyestuffs
-						case 5: delitem 981,1; //Cobaltblue_Dyestuffs
-						case 6: delitem 982,1; //White_Dyestuffs
-						case 7: delitem 983,1; //Black_Dyestuffs
-						case 8: delitem 975,1; //Scarlet_Dyestuffs
+						case 1: delitem 976,1; break; //Lemon_Dyestuffs
+						case 2: delitem 978,1; break; //Violet_Dyestuffs
+						case 3: delitem 979,1; break; //Orange_Dyestuffs
+						case 4: delitem 980,1; break; //Darkgreen_Dyestuffs
+						case 5: delitem 981,1; break; //Cobaltblue_Dyestuffs
+						case 6: delitem 982,1; break; //White_Dyestuffs
+						case 7: delitem 983,1; break; //Black_Dyestuffs
+						case 8: delitem 975,1; break; //Scarlet_Dyestuffs
 						}
 						set Zeny,Zeny-1000;
 						setlook 6,.@headpalette;
@@ -149,4 +150,5 @@ S_NoDye:
 		mes "Eh?! But you need the item '"+getitemname(getarg(0))+"' to dye your hair "+getarg(1)+"...";
 		close;
 	}
-}
+	return;
+}
\ No newline at end of file
-- 
cgit v1.2.3-60-g2f50