*strnpcinfo now uses constants

- NPC_NAME for the whole npc name including hidden part
- NPC_NAME_VISIBLE for the visible part of the npc name
- NPC_NAME_HIDDEN for the hidden part of the npc name
- NPC_NAME_UNIQUE for the npc unique name
- NPC_MAP for npc map

1 files changed, 11 insertions, 11 deletions

diff --git a/npc/re/instances/BangungotHospital.txt b/npc/re/instances/BangungotHospital.txt
index c6a8ac317..66ed61f8a 100644
--- a/npc/re/instances/BangungotHospital.txt
+++ b/npc/re/instances/BangungotHospital.txt
@@ -426,14 +426,14 @@ OnTimer10000:
 1@ma_h,46,165,0	script	#Ward1 Entry	HIDDEN_WARP_NPC,{ //3,3
 	end;
 OnInstanceInit:
-	disablenpc instance_npcname(strnpcinfo(0));
+	disablenpc instance_npcname(strnpcinfo(NPC_NAME));
 	end;
 OnEnable1:
 	.@map$ = instance_mapname("1@ma_h");
-	.@label$ = instance_npcname(strnpcinfo(0))+"::OnMyMobDead";
-	enablenpc instance_npcname(strnpcinfo(0));
+	.@label$ = instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead";
+	enablenpc instance_npcname(strnpcinfo(NPC_NAME));
 	specialeffect EF_BAT2;
-	switch(atoi(charat(strnpcinfo(2),4))) {
+	switch(atoi(charat(strnpcinfo(NPC_NAME_HIDDEN),4))) {
 	case 1:
 		areamonster .@map$,49,171,51,173,"Bangungot's Mangkukulam",2339,1,.@label$;
 		areamonster .@map$,51,171,53,173,"Bangungot's Mangkukulam",2339,1,.@label$;
@@ -466,19 +466,19 @@ OnEnable2:
 	end;
 */
 OnEnable3:
-	.@i = atoi(charat(strnpcinfo(2),4))+1;
+	.@i = atoi(charat(strnpcinfo(NPC_NAME_HIDDEN),4))+1;
 	donpcevent instance_npcname("#Ward"+.@i+" Entry")+"::OnEnable1";
-	disablenpc instance_npcname(strnpcinfo(0));
+	disablenpc instance_npcname(strnpcinfo(NPC_NAME));
 	end;
 OnMyMobDead:
 	initnpctimer;
 	end;
 OnTimer1000:
 	.@map$ = instance_mapname("1@ma_h");
-	if (mobcount(.@map$,instance_npcname(strnpcinfo(0))+"::OnMyMobDead") < 1) {
+	if (mobcount(.@map$,instance_npcname(strnpcinfo(NPC_NAME))+"::OnMyMobDead") < 1) {
 		specialeffect EF_BAT2;
-		donpcevent instance_npcname(strnpcinfo(0))+"::OnEnable3";
-		switch(atoi(charat(strnpcinfo(2),4))) {
+		donpcevent instance_npcname(strnpcinfo(NPC_NAME))+"::OnEnable3";
+		switch(atoi(charat(strnpcinfo(NPC_NAME_HIDDEN),4))) {
 			case 1: .@str$ = "Bangungot: I will let you see the pain and the agony actually be real....."; break;
 			case 2: .@str$ = "Bangungot: Diseased spirits are the source of my energy, and my life..."; break;
 			case 3: .@str$ = "Bangungot: Scream more....and more...... your pain..."; break;
@@ -925,7 +925,7 @@ OnTimer36000:
 1@ma_h,118,171,0	script	#Boss Room Entry_a	HIDDEN_WARP_NPC,10,10,{
 	end;
 OnInstanceInit:
-	disablenpc instance_npcname(strnpcinfo(0));
+	disablenpc instance_npcname(strnpcinfo(NPC_NAME));
 	end;
 OnTouch:
 	specialeffect EF_GHOST;
@@ -984,7 +984,7 @@ OnTimer30000:
 1@ma_h,60,87,4	script	Screaming Patient#2	4_M_PATIENT,{
 	end;
 OnEnable:
-	switch(atoi(strnpcinfo(2))) {
+	switch(atoi(strnpcinfo(NPC_NAME_HIDDEN))) {
 		case 2: .@str$ = "Screaming Patient: Aaaaargh!!"; break;
 		case 3: .@str$ = "Patient in Pain: Oooooowwww!! It's killing me!!!"; break;
 		case 4: .@str$ = "Passed Out Patient: ........"; break;