- Removed security check since source level patch is applied. Reverted select(), created prompt().

modified   Changelog-Trunk.txt
modified   npc/airports/airships.txt
modified   npc/cities/amatsu.txt
modified   npc/cities/gonryun.txt
modified   npc/cities/hugel.txt
modified   npc/cities/lighthalzen.txt
modified   npc/cities/niflheim.txt
modified   npc/cities/valkyrie.txt
modified   npc/custom/eAAC_Scripts/disguiser.txt
modified   npc/custom/eAAC_Scripts/quest_warper.txt
modified   npc/custom/jobs/jobmaster.txt
modified   npc/events/idul_fitri.txt
modified   npc/jobs/1-1e/gunslinger.txt
modified   npc/jobs/1-1e/ninja.txt
modified   npc/jobs/novice/novice.txt
modified   npc/merchants/kunai_maker.txt
modified   npc/merchants/novice_exchange.txt
modified   npc/merchants/refine.txt
modified   npc/other/comodo_gambling.txt
modified   npc/other/dts_warper.txt
modified   npc/other/marriage.txt
modified   npc/other/powernpc.txt
modified   npc/quests/Lvl4_weapon_quest.txt
modified   npc/quests/gunslinger_quests.txt
modified   npc/quests/quests_ein.txt
modified   npc/quests/quests_umbala.txt
modified   npc/sample/monster_controller.cpp
modified   src/map/script.c



git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9267 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 1 insertions, 10 deletions

diff --git a/npc/custom/jobs/jobmaster.txt b/npc/custom/jobs/jobmaster.txt
index e4c72d3f5..c929d4894 100644
--- a/npc/custom/jobs/jobmaster.txt
+++ b/npc/custom/jobs/jobmaster.txt
@@ -78,17 +78,10 @@ prontera.gat,153,193,6	script	Job Master	123,{
 							if(Class == Job_Novice_High) goto L_noReq;

 							set @target_job, @menu + 15;

 							break;

-						case 1:

-						case 2:

-						case 3:

-						case 4:

-						case 5:

-						case 6:						

+						default:

 							set @target_job, @menu;

 							if(Class == Job_Novice_High) set @target_job, @target_job + 4001;

 							break;

-						default:

-							end;

 					}

 			}

 			mes "Are you sure you want to change to " + callfunc("getJobName",@target_job) + "?";

@@ -156,8 +149,6 @@ prontera.gat,153,193,6	script	Job Master	123,{
 					}

 					mes "Welcome, please select the job you wish to change into";

 					set @target_job, @job_opt[select(callfunc("getJobName",@job_opt[0]), callfunc("getJobName",@job_opt[1]))-1];

-					if(@menu < 1 || @menu > 2)

-						end;

 					if(Class > Job_Novice_High && Class < Job_Lord_Knight) set @target_job, @target_job + 4001;

 				}

 				mes "Are you sure you want to change to " + callfunc("getJobName",@target_job) + "?";