From 910042238bb081e769cd756a8268e3cdbef18f9e Mon Sep 17 00:00:00 2001
From: Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Mon, 20 Nov 2006 10:11:20 +0000
Subject: - 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
---
 npc/cities/amatsu.txt      | 3 ---
 npc/cities/gonryun.txt     | 3 ---
 npc/cities/hugel.txt       | 2 --
 npc/cities/lighthalzen.txt | 2 +-
 npc/cities/niflheim.txt    | 9 ---------
 npc/cities/valkyrie.txt    | 1 -
 6 files changed, 1 insertion(+), 19 deletions(-)

(limited to 'npc/cities')

diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt
index e54c56e10..a4542edc3 100644
--- a/npc/cities/amatsu.txt
+++ b/npc/cities/amatsu.txt
@@ -823,9 +823,6 @@ s_Got:
 			set @stoneStr$,"Rough Wind";
 		break;
 
-		case 255:
-			end;
-
 		}
 	if(countitem(@stoneID) < 8)goto s_NEnough;
 	mes "[Laspuchin Gregory]";
diff --git a/npc/cities/gonryun.txt b/npc/cities/gonryun.txt
index bc92d920f..1549721d3 100644
--- a/npc/cities/gonryun.txt
+++ b/npc/cities/gonryun.txt
@@ -239,7 +239,6 @@ gonryun.gat,237,226,3	script	YunKyoHam#gn	776,{
 			mes "My curse shall be on his head!!!";
 			close;
 		}
-		if(@menu == 255) end;
 		mes "[YunKyoHam]";
 		mes "ohoh! Thank you!";
 		mes "Take these potions.";
@@ -501,8 +500,6 @@ gonryun.gat,163,60,4	script	Gonryun Guide	780,{
 		mes "Enjoy your trip in";
 		mes "lovely Gonryun!";
 		break;
-	case 255:
-		end;
 	}
 	close;
 }
diff --git a/npc/cities/hugel.txt b/npc/cities/hugel.txt
index 7d9a9e984..61c6c5bb0 100644
--- a/npc/cities/hugel.txt
+++ b/npc/cities/hugel.txt
@@ -45,8 +45,6 @@ hu_in01.gat,23,311,4	script	Johsh	898,{
 		mes @npcname$;
 		mes "Aww~~ you miss it";
 		close;
-	case 255:
-		end;
 	}
 }
 
diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt
index 49fc9f60b..c03c2c2d0 100644
--- a/npc/cities/lighthalzen.txt
+++ b/npc/cities/lighthalzen.txt
@@ -1050,7 +1050,7 @@ lighthalzen.gat,312,234,2	script	Beggar	777,{
 	mes "Would you give me";
 	mes "some money?";
 	next;
-	if(select("Give him some money.:Ignore him.")==2 || @menu == 255){
+	if(select("Give him some money.:Ignore him.")==2){
 		mes "[" + strcharinfo(0) + "]";
 		mes "...";
 		mes "......";
diff --git a/npc/cities/niflheim.txt b/npc/cities/niflheim.txt
index 99a4e5efd..6c20f0141 100644
--- a/npc/cities/niflheim.txt
+++ b/npc/cities/niflheim.txt
@@ -171,21 +171,12 @@ L_book3:
 	if(select("Clover.:Klaatu.:Kleitos.")==2)
 		set @nif_t,@nif_t + 10;
 
-	if(@menu == 255)
-		end;
-
 	if(select("Verit.:Veritas.:Verata.")==3)
 		set @nif_t,@nif_t + 10;
 
-	if(@menu == 255)
-		end;
-
 	if(select("Necktie.:Necklace.:Nero.:^FFFFFFNictu.^000000")==4)
 		set @nif_t,@nif_t + 10;
 
-	if(@menu == 255)
-		end;
-
 	mes "[Ashe Bruce]";
 	if(@nif_t == 30){
 		if(rand(9)){
diff --git a/npc/cities/valkyrie.txt b/npc/cities/valkyrie.txt
index 502cd46d5..1aea9c3aa 100644
--- a/npc/cities/valkyrie.txt
+++ b/npc/cities/valkyrie.txt
@@ -45,7 +45,6 @@ yuno_in02.gat,93,207,0	script	Book of Ymir	111,{
 		mes "can be realized in the Hall of Honor.";
 		next;
 		switch(select("Stop reading.:Continue reading.")) {
-		case 255:
 		case 1:
 			mes "[Book of Ymir]";
 			mes ". . . . .";
-- 
cgit v1.2.3-60-g2f50