*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

2 files changed, 19 insertions, 19 deletions

diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt
index ea2a65e1c..f4ac6300a 100644
--- a/npc/re/cities/malangdo.txt
+++ b/npc/re/cities/malangdo.txt
@@ -44,7 +44,7 @@
 		next;
 		mes "[Dolangmal]";
 		.@s$ = "Why don't you go to ^A2314BMalangdo^000000?";
-		switch(atoi(strnpcinfo(2))) {
+		switch(atoi(strnpcinfo(NPC_NAME_HIDDEN))) {
 			case 1: mes "How is that? The crowded city of Prontera is good, but why don't you go our heaven of the cats, ^A2314BMalangdo^000000?"; break;
 			case 2: mes "Why don't you go to ^A2314BMalangdo^000000? That place is better than Geffen, where there are only crowds of simple honest wizards."; break;
 			case 3: mes "The fresh air of Payon is not bad, but why don't you go better place like the heaven of the cats, ^A2314BMalangdo^000000?"; break;
@@ -174,7 +174,7 @@ lighthalzen,254,83,5	duplicate(Dolangmal)	Dolangmal#8	4_CAT_DOWN
 mora,57,150,4	duplicate(Dolangmal)	Dolangmal#9	4_CAT_DOWN
 
 -	script	::Odgnalam	FAKE_NPC,{
-	mes "This cat is sleeping in the warm "+((strnpcinfo(2) == "albe")?"Alberta":"Izlude")+" sun.";
+	mes "This cat is sleeping in the warm "+((strnpcinfo(NPC_NAME_HIDDEN) == "albe")?"Alberta":"Izlude")+" sun.";
 	next;
 	if(select("Let him sleep", "Talk to him") == 1) close;
 	mes "[Odgnalam]";
diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt
index 6d69feefe..c8171b9d6 100644
--- a/npc/re/cities/malaya.txt
+++ b/npc/re/cities/malaya.txt
@@ -153,7 +153,7 @@ ma_in01,30,94,4	script	Inn Keeper#ma	4_F_MALAYA,{
 -	script	Unidentified Creature#i	FAKE_NPC,{
 	end;
 OnInit:
-	switch(atoi(strnpcinfo(2))) {
+	switch(atoi(strnpcinfo(NPC_NAME_HIDDEN))) {
 		case 1: setarray .@npc$,"01","02","03","04"; break;
 		case 5: setarray .@npc$,"05","06","07","08"; break;
 		case 9: setarray .@npc$,"09","10","11"; break;
@@ -165,13 +165,13 @@ OnInit:
 		donpcevent "Unidentified Creature#"+.@npc$[.@i]+"::"+((.@i == .@rand)?"OnEnable":"OnDisable");
 	end;
 OnEnable:
-	enablenpc strnpcinfo(0);
+	enablenpc strnpcinfo(NPC_NAME);
 	end;
 OnDisable:
-	disablenpc strnpcinfo(0);
+	disablenpc strnpcinfo(NPC_NAME);
 	end;
 OnBingx2:
-	switch(atoi(strnpcinfo(2))) {
+	switch(atoi(strnpcinfo(NPC_NAME_HIDDEN))) {
 		case 1: setarray .@npc$,"02","03","04"; break;
 		case 5: setarray .@npc$,"06","07","08"; break;
 		case 9: setarray .@npc$,"10","11"; break;
@@ -180,27 +180,27 @@ OnBingx2:
 	.@rand = rand(.@size);
 	for(.@i = 0; .@i<.@size; ++.@i)
 		donpcevent "Unidentified Creature#"+.@npc$[.@i]+"::"+((.@i == .@rand)?"OnEnable":"OnDisable");
-	donpcevent strnpcinfo(0)+"::OnDisable";
+	donpcevent strnpcinfo(NPC_NAME)+"::OnDisable";
 	end;
 OnTouch:
 	if (getcharid(1)) {
 		if ($ma_name04$ == strcharinfo(0) || $ma_name05$ == strcharinfo(0) || $ma_name06$ == strcharinfo(0)) {
-			donpcevent strnpcinfo(0)+"::OnBingx2";
+			donpcevent strnpcinfo(NPC_NAME)+"::OnBingx2";
 			mes "The unidentified creature gets a glimpse of you, blushes and then disappears.";
 			close;
 		}
 		if (rand(1,5)%2) {
-			switch(atoi(strnpcinfo(2))) {
+			switch(atoi(strnpcinfo(NPC_NAME_HIDDEN))) {
 				case 1: $ma_name04$ = strcharinfo(0); break;
 				case 5: $ma_name05$ = strcharinfo(0); break;
 				case 9: $ma_name06$ = strcharinfo(0); break;
 			}
 		}
-		donpcevent strnpcinfo(0)+"::OnBingx2";
+		donpcevent strnpcinfo(NPC_NAME)+"::OnBingx2";
 		mes "The unidentified creature gets a glimpse of you and disappears.";
 		close;
 	}
-	donpcevent strnpcinfo(0)+"::OnBingx2";
+	donpcevent strnpcinfo(NPC_NAME)+"::OnBingx2";
 	mes "The unidentified creature looks at you and runs away.";
 	close;
 }
@@ -211,13 +211,13 @@ ma_scene01,195,92,4	duplicate(Unidentified Creature#i)	Unidentified Creature#09
 -	script	Unidentified Creature#j	FAKE_NPC,{
 	end;
 OnEnable:
-	enablenpc strnpcinfo(0);
+	enablenpc strnpcinfo(NPC_NAME);
 	end;
 OnDisable:
-	disablenpc strnpcinfo(0);
+	disablenpc strnpcinfo(NPC_NAME);
 	end;
 OnBingx2:
-	switch(atoi(strnpcinfo(2))) {
+	switch(atoi(strnpcinfo(NPC_NAME_HIDDEN))) {
 		case 2: setarray .@npc$,"01","03","04"; break;
 		case 3: setarray .@npc$,"01","02","04"; break;
 		case 4: setarray .@npc$,"01","02","03"; break;
@@ -231,10 +231,10 @@ OnBingx2:
 	.@rand = rand(.@size);
 	for(.@i = 0; .@i<.@size; ++.@i)
 		donpcevent "Unidentified Creature#"+.@npc$[.@i]+"::"+((.@i == .@rand)?"OnEnable":"OnDisable");
-	donpcevent strnpcinfo(0)+"::OnDisable";
+	donpcevent strnpcinfo(NPC_NAME)+"::OnDisable";
 	end;
 OnTouch:
-	.@i = atoi(strnpcinfo(2));
+	.@i = atoi(strnpcinfo(NPC_NAME_HIDDEN));
 	if (.@i%4 == 2) {
 		if (getcharid(0) == getpartyleader(getcharid(1),2))
 			.@pass = 1;
@@ -247,7 +247,7 @@ OnTouch:
 	}
 	if (.@pass) {
 		if ($ma_name04$ == strcharinfo(0) || $ma_name05$ == strcharinfo(0) || $ma_name06$ == strcharinfo(0)) {
-			donpcevent strnpcinfo(0)+"::OnBingx2";
+			donpcevent strnpcinfo(NPC_NAME)+"::OnBingx2";
 			mes "The unidentified creature gets a glimpse of you, blushes and then disappears.";
 			close;
 		}
@@ -269,11 +269,11 @@ OnTouch:
 				break;
 			}
 		}
-		donpcevent strnpcinfo(0)+"::OnBingx2";
+		donpcevent strnpcinfo(NPC_NAME)+"::OnBingx2";
 		mes "The unidentified creature gets a glimpse of you and disappears.";
 		close;
 	}
-	donpcevent strnpcinfo(0)+"::OnBingx2";
+	donpcevent strnpcinfo(NPC_NAME)+"::OnBingx2";
 	mes "The unidentified creature looks at you and runs away.";
 	close;
 }