From f802229a182ff7b88719dcbdf89716ab52751ab8 Mon Sep 17 00:00:00 2001
From: Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Mon, 22 May 2006 09:07:50 +0000
Subject: * Global_Functions fix. Jobmaster fix.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6687 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 npc/Changelog.txt              | 2 ++
 npc/custom/jobs/jobmaster.txt  | 2 +-
 npc/other/Global_Functions.txt | 6 ++++--
 npc/scripts_custom.conf        | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 0c344229f..94056be8d 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -30,6 +30,8 @@ Evera
 
 Date		Added
 ======
+05/22
+	* Global_Functions fix. Jobmaster fix. [Lance]
 05/19
 	* eAAC Update + Fix [erKURITA]
 	* Translated sample/gstorage_test.txt
diff --git a/npc/custom/jobs/jobmaster.txt b/npc/custom/jobs/jobmaster.txt
index 10a22d197..6c27c4a8f 100644
--- a/npc/custom/jobs/jobmaster.txt
+++ b/npc/custom/jobs/jobmaster.txt
@@ -84,7 +84,7 @@ prontera.gat,153,193,6	script	Job Master	123,{
 							break;
 					}
 			}
-			mes "Are you sure?";
+			mes "Are you sure you want to change to " + callfunc("getJobName",@target_job) + "?";
 			if(select("No","Yes") == 2){
 				callfunc "Job_Change", @target_job;
 				if(@target_job == Job_Gunsliger || @target_job == Job_Ninja || @target_job == Job_Taekwon) {
diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt
index 9b25cdce5..5725b1c0c 100644
--- a/npc/other/Global_Functions.txt
+++ b/npc/other/Global_Functions.txt
@@ -68,8 +68,10 @@ function	script	F_ClearJobVar	{
 //////////////////////////////////////////////////////////////////////////////////
 
 function	script	Job_Change	{
-	if (Upper==0) jobchange getarg(0); //Change Job For Common
-	if (Upper==2) jobchange getarg(0) + Job_Baby; //Change Job For Baby Class
+	if (Upper<2) 
+		jobchange getarg(0); // Common jobchange
+	else 
+		jobchange getarg(0) + Job_Baby; //Change Job For Baby Class
 	return;
 }
 
diff --git a/npc/scripts_custom.conf b/npc/scripts_custom.conf
index c29aff591..f6c48fb5c 100644
--- a/npc/scripts_custom.conf
+++ b/npc/scripts_custom.conf
@@ -36,7 +36,7 @@ npc: npc/custom/adoption.txt
 // -- Reset NPC
 //npc: npc/custom/jobs/reset.txt
 // -- Job Changer
-//npc: npc/custom/jobs/jobmaster.txt
+npc: npc/custom/jobs/jobmaster.txt
 // -- Healer(s)
 //npc: npc/custom/healers/heal.txt
 //npc: npc/custom/healers/heal_payment.txt
-- 
cgit v1.2.3-70-g09d2