From 05a2538114972de94352e66586f6f2a5affea9c6 Mon Sep 17 00:00:00 2001
From: Emistry <Equinox1991@gmail.com>
Date: Mon, 25 Jan 2016 23:00:26 +0800
Subject: Replaced the SEX_FEMALE/SEX_MALE constants to scripts, where
 appropriate

---
 npc/other/marriage.txt | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'npc/other/marriage.txt')

diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt
index 0795e2606..7522c4242 100644
--- a/npc/other/marriage.txt
+++ b/npc/other/marriage.txt
@@ -199,7 +199,7 @@ prt_church,97,100,4	script	Wedding Staff#w	1_F_LIBRARYGIRL,{
 
 	case 3:
 		cutin "wedding_marry02",2;
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			mes "[Marry Happy]";
 			mes "So you'd like to get married?";
 			mes "As a groom, you need to prepare";
@@ -273,8 +273,7 @@ prt_church,97,100,4	script	Wedding Staff#w	1_F_LIBRARYGIRL,{
 				mes "Look for it carefully and come";
 				mes "back after you find it, okay?";
 				goto L_End;
-			}
-			else if (Sex) {
+			} else if (Sex == SEX_MALE) {
 				if (Zeny < 1300000) {
 					mes "[Marry Happy]";
 					mes "I'm sorry, but you don't";
@@ -294,8 +293,7 @@ prt_church,97,100,4	script	Wedding Staff#w	1_F_LIBRARYGIRL,{
 					mes "begin the wedding, okay?";
 					goto L_End;
 				}
-			}
-			else if (Sex == 0) {
+			} else if (Sex == SEX_FEMALE) {
 				if (Zeny < 1200000) {
 					mes "[Marry Happy]";
 					mes "I'm sorry, but all brides";
@@ -359,7 +357,7 @@ prt_church,97,100,4	script	Wedding Staff#w	1_F_LIBRARYGIRL,{
 			emotion e_lv;
 			next;
 			mes "[Marry Happy]";
-			if (Sex) {
+			if (Sex == SEX_MALE) {
 				mes "Since you're the groom,";
 				mes "you need to speak to the";
 				mes "Bishop first. When you're";
@@ -582,7 +580,7 @@ prt_church,100,128,4	script	Bishop#w	1_M_PASTOR,{
 				getpartymember(getcharid(1));
 				.@partymembercount = $@partymembercount;
 				if (.@partymembercount == 2) {
-					if (Sex) {
+					if (Sex == SEX_MALE) {
 						$@wedding = 1;
 						initnpctimer;
 						mes "[Vomars]";
@@ -653,7 +651,7 @@ prt_church,100,128,4	script	Bishop#w	1_M_PASTOR,{
 				getpartymember(getcharid(1));
 				.@partymembercount = $@partymembercount;
 				if (.@partymembercount == 2) {
-					if (Sex == 0) {
+					if (Sex == SEX_FEMALE) {
 						if (strcharinfo(0) == $@wed_bride$) {
 							mes "[Vomars]";
 							mes "Young lovers, please";
@@ -893,7 +891,7 @@ prt_church,20,179,4	script	Divorce Staff	1_F_LIBRARYGIRL,{
 	next;
 	switch(select("Drop 1 Wedding Ring.", "Keep it.")) {
 	case 1:
-		.@ring = (Sex)?2634:2635; //Bridegroom_Ring, Bride_Ring
+		.@ring = (Sex == SEX_MALE) ? 2634 : 2635; //Bridegroom_Ring, Bride_Ring
 		if (countitem(.@ring)) {
 			delitem .@ring,1;
 			mes "[Bad Ending]";
@@ -948,7 +946,7 @@ prt_church,22,179,4	script	Remarry Staff	1_F_LIBRARYGIRL,{
 	next;
 	switch(select("Make new Wedding Ring.", "Cancel.")) {
 	case 1:
-		.@ring = (Sex)?2634:2635; //Bridegroom_Ring, Bride_Ring
+		.@ring = (Sex == SEX_MALE) ? 2634 : 2635; //Bridegroom_Ring, Bride_Ring
 		if (countitem(.@ring) || isequipped(.@ring)) {
 			mes "[Wedding Again]";
 			mes "Wait, wait...";
-- 
cgit v1.2.3-70-g09d2