change *strcharinfo to use constants

4 files changed, 20 insertions, 20 deletions

diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt
index 7817db3b8..d140a0d24 100644
--- a/npc/re/cities/dewata.txt
+++ b/npc/re/cities/dewata.txt
@@ -842,7 +842,7 @@ OnTouch:
 	emotion e_sob;
 	emotion e_swt2;
 	next;
-	mes "["+strcharinfo(0)+"]";
+	mes "["+strcharinfo(PC_NAME)+"]";
 	mes "Hey, kid...";
 	next;
 	mes "[Ukki]";
@@ -854,7 +854,7 @@ OnTouch:
 	emotion e_sob;
 	emotion e_swt2;
 	next;
-	mes "["+strcharinfo(0)+"]";
+	mes "["+strcharinfo(PC_NAME)+"]";
 	mes "... ... ...";
 	emotion e_dots,1;
 	close;
diff --git a/npc/re/cities/dicastes.txt b/npc/re/cities/dicastes.txt
index 43571facb..a00a549ac 100644
--- a/npc/re/cities/dicastes.txt
+++ b/npc/re/cities/dicastes.txt
@@ -641,7 +641,7 @@ dicastes01,191,202,4	script	Complaining Galten#fihs	4_MAN_GALTUN,{
 		mes "[Complaining Galten]";
 		mes "You also fell for that crazy man.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Yes";
 		emotion e_sob,1;
 		next;
@@ -684,18 +684,18 @@ dicastes01,202,197,4	script	Crazy Venknick#fihsing1	4_MAN_BENKUNI,{
 		mes "Thanks.";
 		emotion e_gg,0,"Complaining Galten#fihs";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "What is the sad legend?";
 		next;
 		emotion e_dots;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "I asked what the sad legend is about!";
 		next;
 		mes "[Crazy Venknick]";
 		mes "I don't believe in legends.";
 		next;
 		emotion e_dots,1;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Was I tricked?";
 		sc_start SC_BLIND,20000,0;
 		next;
diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt
index c8171b9d6..afe816a3e 100644
--- a/npc/re/cities/malaya.txt
+++ b/npc/re/cities/malaya.txt
@@ -184,16 +184,16 @@ OnBingx2:
 	end;
 OnTouch:
 	if (getcharid(1)) {
-		if ($ma_name04$ == strcharinfo(0) || $ma_name05$ == strcharinfo(0) || $ma_name06$ == strcharinfo(0)) {
+		if ($ma_name04$ == strcharinfo(PC_NAME) || $ma_name05$ == strcharinfo(PC_NAME) || $ma_name06$ == strcharinfo(PC_NAME)) {
 			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(NPC_NAME_HIDDEN))) {
-				case 1: $ma_name04$ = strcharinfo(0); break;
-				case 5: $ma_name05$ = strcharinfo(0); break;
-				case 9: $ma_name06$ = strcharinfo(0); break;
+				case 1: $ma_name04$ = strcharinfo(PC_NAME); break;
+				case 5: $ma_name05$ = strcharinfo(PC_NAME); break;
+				case 9: $ma_name06$ = strcharinfo(PC_NAME); break;
 			}
 		}
 		donpcevent strnpcinfo(NPC_NAME)+"::OnBingx2";
@@ -246,7 +246,7 @@ OnTouch:
 			.@pass = 1;
 	}
 	if (.@pass) {
-		if ($ma_name04$ == strcharinfo(0) || $ma_name05$ == strcharinfo(0) || $ma_name06$ == strcharinfo(0)) {
+		if ($ma_name04$ == strcharinfo(PC_NAME) || $ma_name05$ == strcharinfo(PC_NAME) || $ma_name06$ == strcharinfo(PC_NAME)) {
 			donpcevent strnpcinfo(NPC_NAME)+"::OnBingx2";
 			mes "The unidentified creature gets a glimpse of you, blushes and then disappears.";
 			close;
@@ -256,16 +256,16 @@ OnTouch:
 			case 2:
 			case 3:
 			case 4:
-				$ma_name04$ = strcharinfo(0);
+				$ma_name04$ = strcharinfo(PC_NAME);
 				break;
 			case 6:
 			case 7:
 			case 8:
-				$ma_name05$ = strcharinfo(0);
+				$ma_name05$ = strcharinfo(PC_NAME);
 				break;
 			case 10:
 			case 11:
-				$ma_name06$ = strcharinfo(0);
+				$ma_name06$ = strcharinfo(PC_NAME);
 				break;
 			}
 		}
diff --git a/npc/re/cities/mora.txt b/npc/re/cities/mora.txt
index 48df72c11..1b231024c 100644
--- a/npc/re/cities/mora.txt
+++ b/npc/re/cities/mora.txt
@@ -481,7 +481,7 @@ mora,140,186,3	script	Raffle Philosopher	4_M_RAFLE_OLD,{
 	mes "Okay! I think this is the one for you.";
 	next;
 	mes "[Raffle Philosopher]";
-	mes strcharinfo(0)+", the quote I'm going to tell you is...";
+	mes strcharinfo(PC_NAME)+", the quote I'm going to tell you is...";
 	switch(rand(1,70)) {
 	case 1:
 		mes "Nothing is more difficult,";
@@ -954,7 +954,7 @@ mora,140,186,3	script	Raffle Philosopher	4_M_RAFLE_OLD,{
 		mes "leaving the travelers behind you.";
 		close;
 	}
-	mes "["+strcharinfo(0)+"]";
+	mes "["+strcharinfo(PC_NAME)+"]";
 	mes "What's happening here?";
 	emotion e_what,1;
 	next;
@@ -983,7 +983,7 @@ mora,140,186,3	script	Raffle Philosopher	4_M_RAFLE_OLD,{
 	next;
 	switch(select("Roseten.", "Rose.", "How would I know that?")) {
 	case 1:
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "The answer to the question is Roseten.";
 		mes "Why are you fighting over such a trivial matter?";
 		next;
@@ -998,7 +998,7 @@ mora,140,186,3	script	Raffle Philosopher	4_M_RAFLE_OLD,{
 		emotion e_an,0,"Traveler#ep14_1_2";
 		break;
 	case 2:
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "The answer to the question is Rose.";
 		mes "You said Rose's mother had 10 sons.";
 		mes "So even if the other sons' names are";
@@ -1018,7 +1018,7 @@ mora,140,186,3	script	Raffle Philosopher	4_M_RAFLE_OLD,{
 		emotion e_ag,0,"Traveler#ep14_1_1";
 		break;
 	case 3:
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "I have no idea.";
 		mes "Try to sort it out yourselves.";
 		next;
@@ -1147,7 +1147,7 @@ mora,43,127,3	script	Innkeeper#mora_inn	4_M_RAFLE_OR,{
 		}
 	case 3:
 		input .@inputstr$;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "I come from a place called "+.@inputstr$+".";
 		next;
 		mes "[Innkeeper]";