- 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, 9 deletions

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;