- 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

4 files changed, 9 insertions, 21 deletions

diff --git a/npc/other/comodo_gambling.txt b/npc/other/comodo_gambling.txt
index f9cbd557b..9412810e1 100644
--- a/npc/other/comodo_gambling.txt
+++ b/npc/other/comodo_gambling.txt
@@ -124,8 +124,6 @@ comodo.gat,219,160,3	script	Kachua	91,{
 		set @item,512;

 		switch( select( "Weapon", "Armor", "Garment", "Helmet", "Shoes", "Shield" ) )

 		{

-			case 255:

-				end;

 										case 1: // Weapons

 											set @gamble,rand(1,1000);

 											if ((@gamble > 920) && (@gamble < 931))

diff --git a/npc/other/dts_warper.txt b/npc/other/dts_warper.txt
index 31d38bba2..f7f71d9c2 100644
--- a/npc/other/dts_warper.txt
+++ b/npc/other/dts_warper.txt
@@ -824,13 +824,17 @@ function	script	F_DTS_Warp	{
 	next;

 	switch(select(@dtswarp$[0],@dtswarp$[1],@dtswarp$[2],@dtswarp$[3])){

 		case 1:

+			set @num, 0;

+			break;

 		case 2:

+			set @num, 1;

+			break;

 		case 3:

+			set @num, 2;

+			break;

 		case 4:

-			set @num, @menu - 1;

+			set @num, 3;

 			break;

-		default:

-			end;

 	}

 	Lwarp:

 		if (@dtswarp$[@num] == "Cancel") goto Lcancel;

diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt
index 35571a1ae..200968bb2 100644
--- a/npc/other/marriage.txt
+++ b/npc/other/marriage.txt
@@ -215,8 +215,6 @@ function SF_AcceptGroom {
 		mes "["+@name$+"]";

 		mes "After your groom approves, you will be given your rings, the ceremony will begin and you will be officially married.";

 		close;

-	default:

-		end;

 	}

 }

 

@@ -250,8 +248,6 @@ function SF_AcceptBride {
 		mes "["+@name$+"]";

 		mes "After your bride approves, you will be given your rings, the ceremony will begin and you will be officially married.";

 		close;

-	default:

-		end;

 	}

 }

 

@@ -482,8 +478,6 @@ prt_church.gat,106,99,3	script	Sister Mary	67,{
 		case 4: //Register

 			SF_Register();

 			break;

-		default:

-			end;

 		}

 	} while (@menu > 1);

 	end;

@@ -879,8 +873,6 @@ prt_church.gat,94,99,4	script	Sister Lisa	79,{
 			initnpctimer;

 			mes "Very well, get your partner to confirm, and I will collect the fee for filing the divorce then.";

 			close;

-		default:

-			end;

 		}

 	} while (@menu > 1);

 end;

@@ -902,7 +894,7 @@ function SF_InProgress {
 	mes $@divorcer$+" has asked to divorce you. If you accept, and have the fee of "+$@wed_divorce_fee+"z at hand, I will proceed to divorce you two.";

 	mes "So, should I proceed with the divorce?";

 	next;

-	if (select("I don't want to divorce....", "Yes, we have agreed to this.") !=2) {

+	if (select("I don't want to divorce....","Yes, we have agreed to this.")!=2) {

 		mes "["+@name$+"]";

 		mes "I hope you can work things out.";

 		emotion e_pat;

diff --git a/npc/other/powernpc.txt b/npc/other/powernpc.txt
index 5785d1201..94539780e 100644
--- a/npc/other/powernpc.txt
+++ b/npc/other/powernpc.txt
@@ -110,7 +110,6 @@ gonryun.gat,180,118,4	script	Iron man#gnp	85,{
 			mes "something new. Wanna try??";

 			break;

 		case 3:

-		case 255:

 			mes "[Songmoodoo]";

 			mes "I guess not..";

 			mes "....";

@@ -165,7 +164,7 @@ gon_test.gat,50,14,4	script	Administrator#gnp	780,{
 	mes "Remember, you have to pay";

 	mes "500z to fight.";

 	next;

-	if (select("Yes, let me fight!:One moment, please.") != 1) {

+	if (select("Yes, let me fight!:One moment, please.") == 2) {

 		mes "[Administrator]";

 		mes "Ok, see you later.";

 		close;

@@ -200,15 +199,11 @@ gon_test.gat,42,89,4	script	Summoner#gnp	774,{
 	mes "Which monster would you recall?";

 	next;

 	set @gnpGroup,select("Group 1:Group 2:Group 3:Group 4:Group 5:Group 6:Group 7:Group 8:Group 9:Group 10:Group 11");

-	if(@gnpGroup > 11 || @gnpGroup < 1)

-		end;

 	set @gnpGroupMob$,.gnpMobsName$[(@gnpGroup-1)*6];

 	for (set @i,1; @i < 6; set @i, @i+1) {

 		set @gnpGroupMob$, @gnpGroupMob$ + ":" + .gnpMobsName$[(@gnpGroup-1)*6 + @i];

 	}

 	set @gnpMob,select(@gnpGroupMob$);

-	if(@gnpMob > 6 || @gnpMob < 1)

-		end;

 	mes "[SongYeunWoo]";

 	mes "Let the fight begin!";

 	close2;

@@ -310,7 +305,6 @@ gon_test.gat,46,14,3	script	Guide of field of fight#gnp	770,{
 		warp "gonryun.gat",177,112;

 		end;

 	case 5:

-	case 255:

 		mes "[SongHeeYeon]";

 		mes "........";

 		mes "Good bye..";