*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

3 files changed, 3 insertions, 3 deletions

diff --git a/npc/re/warps/cities/dicastes.txt b/npc/re/warps/cities/dicastes.txt
index e9b90614c..862765d9a 100644
--- a/npc/re/warps/cities/dicastes.txt
+++ b/npc/re/warps/cities/dicastes.txt
@@ -66,7 +66,7 @@ dic_in01,242,182,0	script	#eldicastes0016	CLEAR_NPC,{
 
 // Elevators
 -	script	Elevator#main	FAKE_NPC,{
-	.@n = atoi(strnpcinfo(2));
+	.@n = atoi(strnpcinfo(NPC_NAME_HIDDEN));
 	.@eq = (isequipped(2782))?1:0;
 	if (.@n <= 4) {
 		.@m$ = (.@eq)?"Civil Services:Archive Room:Situation Room:Administrative Office":"¢³¡ð¡Ð:¡ñ¡ñ¡ò:¡ø¡ø¡ð:¡÷¡ú¡ð";
diff --git a/npc/re/warps/cities/izlude.txt b/npc/re/warps/cities/izlude.txt
index a6229d25b..a8062d578 100644
--- a/npc/re/warps/cities/izlude.txt
+++ b/npc/re/warps/cities/izlude.txt
@@ -87,7 +87,7 @@ iz_int,96,73,0	script	iz_int_iz	WARPNPC,2,2,{
 
 	OnTouch:
 		savepoint "izlude", 128, 98;
-		warp "izlude"+strnpcinfo(2)+"", 195, 209;
+		warp "izlude"+strnpcinfo(NPC_NAME_HIDDEN)+"", 195, 209;
 		end;
 }
 
diff --git a/npc/re/warps/fields/bif_fild.txt b/npc/re/warps/fields/bif_fild.txt
index 2122ae15f..68e3f4f7a 100644
--- a/npc/re/warps/fields/bif_fild.txt
+++ b/npc/re/warps/fields/bif_fild.txt
@@ -47,7 +47,7 @@ mora,56,25,0	warp	bifrost_field0005	1,1,bif_fild02,176,162
 		mes "When you knock on the door-like thing just for fun,";
 		mes "the door clicks open and you feel some mysterious force pulling you inside.";
 		close2;
-		switch(atoi(charat(strnpcinfo(2),9))) {
+		switch(atoi(charat(strnpcinfo(NPC_NAME_HIDDEN),9))) {
 			case 1: warp "mora",179,74; end;
 			case 2: warp "mora",22,157; end;
 			case 3: warp "mora",58,27; end;