From 88929e74e284e649eb32b2a923f819c35ecccbf6 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Mon, 20 Oct 2014 04:33:58 +0200
Subject: Removed use of 'checkquest' from scripts (pre-re folder)

Signed-off-by: Haru <haru@dotalux.com>
---
 npc/pre-re/jobs/1-1/acolyte.txt  | 4 ++--
 npc/pre-re/jobs/1-1/mage.txt     | 6 +++---
 npc/pre-re/jobs/1-1/merchant.txt | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'npc/pre-re/jobs')

diff --git a/npc/pre-re/jobs/1-1/acolyte.txt b/npc/pre-re/jobs/1-1/acolyte.txt
index 2faef7c87..49bb33c9b 100644
--- a/npc/pre-re/jobs/1-1/acolyte.txt
+++ b/npc/pre-re/jobs/1-1/acolyte.txt
@@ -182,10 +182,10 @@ prt_church,184,41,4	script	Cleric#aco	1_M_PASTOR,{
 		skill 143,0,0;
 		callfunc "Job_Change",Job_Acolyte;
 		callfunc "F_ClearJobVar";
-		if(checkquest(1001) != -1) {
+		if (questprogress(1001)) {
 			completequest 1001;
 		}
-		else if(checkquest(1002) != -1) {
+		else if (questprogress(1002)) {
 			completequest 1002;
 		}
 		else {
diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt
index 2e03ce410..b2c6b346d 100644
--- a/npc/pre-re/jobs/1-1/mage.txt
+++ b/npc/pre-re/jobs/1-1/mage.txt
@@ -208,13 +208,13 @@ geffen_in,164,124,4	script	Mage Guildsman	2_F_MAGICMASTER,{
 		callfunc "Job_Change",Job_Mage;
 		callfunc "F_ClearJobVar";
 		Zeny += 50;
-		if(checkquest(1005) != -1) {
+		if (questprogress(1005)) {
 			completequest 1005;
 		}
-		else if(checkquest(1006) != -1) {
+		else if (questprogress(1006)) {
 			completequest 1006;
 		}
-		else if(checkquest(1007) != -1) {
+		else if (questprogress(1007)) {
 			completequest 1007;
 		}
 		else {
diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt
index 47c1e3242..4162bf0b1 100644
--- a/npc/pre-re/jobs/1-1/merchant.txt
+++ b/npc/pre-re/jobs/1-1/merchant.txt
@@ -151,13 +151,13 @@ alberta_in,53,43,6	script	Merchant#mer	4_M_04,{
 		mes "Congratulations!";
 		callfunc "Job_Change",Job_Merchant;
 		callfunc "F_ClearJobVar";
-		if(checkquest(1009) != -1) {
+		if (questprogress(1009)) {
 			completequest 1009;
 		}
-		else if(checkquest(1010) != -1) {
+		else if (questprogress(1010)) {
 			completequest 1010;
 		}
-		else if(checkquest(1011) != -1) {
+		else if (questprogress(1011)) {
 			completequest 1011;
 		}
 		else {
-- 
cgit v1.2.3-60-g2f50