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/re/jobs/3-1/guillotine_cross.txt | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'npc/re/jobs/3-1/guillotine_cross.txt')

diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt
index c2796526b..a29961eca 100644
--- a/npc/re/jobs/3-1/guillotine_cross.txt
+++ b/npc/re/jobs/3-1/guillotine_cross.txt
@@ -257,7 +257,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	4_F_DESERT,{
 	mes "[Daora]";
 	if (Class == Job_Assassin || Class == Job_Assassin_Cross || Class == Job_Baby_Assassin) {
 		if (job_3rd_gc < 4) {
-			if (Sex) {
+			if (Sex == SEX_MALE) {
 				mes "Oh~ you're good-looking!";
 				mes "So, what do you want?";
 			} else {
@@ -755,7 +755,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	4_F_DESERT,{
 			close;
 		}
 	} else if (Class == Job_Guillotine_Cross || Class == Job_Guillotine_Cross_T || Class == Job_Baby_Cross) {
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			mes "Oh~ you're good-looking~!";
 			mes "It's worthwhile to open a pub~";
 			mes "I can feel fruitful labors whenever I see a guy like you~";
@@ -788,7 +788,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	4_F_DESERT,{
 			close;
 		case 3:
 			mes "[Daora]";
-			if (Sex) {
+			if (Sex == SEX_MALE) {
 				mes "Uh... Umm...";
 				mes "It's complicated order. but I don't have any choice since you want it.";
 				next;
@@ -813,7 +813,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	4_F_DESERT,{
 			}
 		}
 	} else {
-		if (Sex == 1) {
+		if (Sex == SEX_MALE) {
 			mes "Oh~ you're good-looking!";
 			mes "So, what do you want?";
 		}
@@ -1218,8 +1218,10 @@ ve_in,228,108,3	script	Waitress#3rdgc04	1_F_PUBGIRL,{
 					mes "What? My name?";
 					mes "Are you hitting on me?";
 					mes "Don't do that.";
-					if (Sex) mes "You are not my type.";
-					else mes "I don't swing that way.";
+					if (Sex == SEX_MALE)
+						mes "You are not my type.";
+					else
+						mes "I don't swing that way.";
 					close;
 				case 3:
 					mes "[Waitress]";
@@ -2025,7 +2027,7 @@ veins,223,180,3	script	Girl#3rdgc09	4_F_DST_CHILD,{
 				}
 				next;
 				mes "[Melissa]";
-				mes "Hi, "+((Sex)?"brother":"sister")+"~ Let me collect all of the information you've provided...";
+				mes "Hi, "+ (Sex == SEX_MALE ? "brother" : "sister")+ "~ Let me collect all of the information you've provided...";
 				next;
 				mes "- She begins to murmur and gestures toward the sky. Her hair springs up as she says... -";
 				next;
-- 
cgit v1.2.3-70-g09d2