1 files changed, 19 insertions, 20 deletions

diff --git a/npc/re/instances/BangungotHospital.txt b/npc/re/instances/BangungotHospital.txt
index b995092a1..d4ac3f9b0 100644
--- a/npc/re/instances/BangungotHospital.txt
+++ b/npc/re/instances/BangungotHospital.txt
@@ -23,9 +23,9 @@ ma_dun01,147,10,5	script	Nurse#ma_dun01	4_F_NURSE,{
 
 	set .@party_id,getcharid(1);
 	cutin "malaya_nurseB",2;
-	if (checkquest(9223) == -1) {
-		set .@quest, checkquest(9222);
-		if (.@quest == -1) {
+	if (!questprogress(9223)) {
+		.@quest = questprogress(9222);
+		if (!.@quest) {
 			if (!.@party_id) {
 				if (malaya_bang == 30)
 					callsub L_Closed,1;
@@ -34,9 +34,9 @@ ma_dun01,147,10,5	script	Nurse#ma_dun01	4_F_NURSE,{
 				else
 					goto L_NoParty;
 			}
-			if (checkquest(11309,HUNTING) < 2) {
-				set .@playtime, checkquest(9224,PLAYTIME);
-				if (.@playtime == -1) {
+			if (questprogress(11309,HUNTING) != 2) {
+				.@playtime = questprogress(9224,PLAYTIME);
+				if (!.@playtime) {
 					if (malaya_bang == 30)
 						callsub L_Closed,1;
 					else if (malaya_bang == 31)
@@ -50,8 +50,8 @@ ma_dun01,147,10,5	script	Nurse#ma_dun01	4_F_NURSE,{
 						cutin "",255;
 						end;
 					}
-				} else if (.@playtime == 0 || .@playtime == 1) {
-					if (checkquest(11309) == -1) {
+				} else if (.@playtime == 1) {
+					if (!questprogress(11309)) {
 						mes "[Nurse Maenne]";
 						mes "This is a fatal situation.";
 						close2;
@@ -73,10 +73,10 @@ ma_dun01,147,10,5	script	Nurse#ma_dun01	4_F_NURSE,{
 						end;
 					}
 				} else {
-					set .@quest2, checkquest(11309);
-					if (.@quest2 == -1) {
+					.@quest2 = questprogress(11309);
+					if (!.@quest2) {
 						callsub L_Closed,0;
-					} else if (.@quest2 == 0 || .@quest2 == 1) {
+					} else if (.@quest2 == 1) {
 						callsub L_Complete;
 						completequest 9224;
 						erasequest 9224;
@@ -105,13 +105,12 @@ ma_dun01,147,10,5	script	Nurse#ma_dun01	4_F_NURSE,{
 				cutin "",255;
 				end;
 			}
-		} else if (.@quest == 0 || .@quest == 1) {
+		} else if (.@quest == 1) {
 			if (!.@party_id) goto L_NoParty;
 			if (malaya_bang > 39) {
-				set .@hunting, checkquest(9222,HUNTING);
-				if (.@hunting == 0 || .@hunting == 1) {
-					set .@playtime, checkquest(9224,PLAYTIME);
-					if (.@playtime == 0 || .@playtime == 1) {
+				if (questprogress(9222,HUNTING) == 1) {
+					.@playtime = questprogress(9224,PLAYTIME);
+					if (.@playtime == 1) {
 						mes "[Nurse Maenne]";
 						mes "Do you want go up to the second floor again?";
 						next;
@@ -190,7 +189,7 @@ ma_dun01,147,10,5	script	Nurse#ma_dun01	4_F_NURSE,{
 			end;
 		}
 	} else {
-		if (checkquest(9223,PLAYTIME) == 0 || checkquest(9223,PLAYTIME) == 1) {
+		if (questprogress(9223,PLAYTIME) == 1) {
 			callsub L_Complete;
 			close2;
 			cutin "",255;
@@ -297,13 +296,13 @@ L_Enter:
 		} else {
 			mapannounce "ma_dun01", getpartyname(getcharid(1))+" party's "+strcharinfo(0)+" member entered "+.@md_name$+".",bc_map,"0x00ff99";
 			if (getarg(1)) {
-				if (checkquest(9223) > -1) {
+				if (questprogress(9223)) {
 					completequest 9223;
 					erasequest 9223;
 				}
-				if (checkquest(9222) > -1)
+				if (questprogress(9222))
 					erasequest 9222;
-				if (checkquest(9224) > -1)
+				if (questprogress(9224))
 					erasequest 9224;
 				setquest 9222;
 			}