Change *getcharid to use constants

21 files changed, 44 insertions, 44 deletions

diff --git a/npc/woe-fe/agit_main.txt b/npc/woe-fe/agit_main.txt
index 912063b8b..5ac5b8e9a 100644
--- a/npc/woe-fe/agit_main.txt
+++ b/npc/woe-fe/agit_main.txt
@@ -101,10 +101,10 @@ OnStartArena:
 
 // The Emperium has been broken.
 OnAgitBreak:
-	.@GID = getcharid(2);
+	.@GID = getcharid(CHAR_ID_GUILD);
 	// Show and log error if an unguilded player breaks the Emperium. (Should NEVER happen)
 	if (.@GID <= 0) {
-		.@notice$ = "Character "+strcharinfo(PC_NAME)+" ("+getcharid(0)+") broke the Emperium in Castle: "+strnpcinfo(NPC_NAME_HIDDEN)+" while guildless. No data will be saved and Emperium respawned.";
+		.@notice$ = "Character "+strcharinfo(PC_NAME)+" ("+getcharid(CHAR_ID_CHAR)+") broke the Emperium in Castle: "+strnpcinfo(NPC_NAME_HIDDEN)+" while guildless. No data will be saved and Emperium respawned.";
 		logmes .@notice$; debugmes .@notice$;
 		donpcevent "Agit#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnStartArena";
 		end;
@@ -342,7 +342,7 @@ OnRecvCastle:
 	}
 
 	cutin "kafra_01",2;
-	if (getcharid(2) == .@GID) {
+	if (getcharid(CHAR_ID_GUILD) == .@GID) {
 		mes "[Kafra Employee]";
 		mes "Welcome. ^ff0000" + getguildname(.@GID) + "^000000 Member.";
 		mes "The Kafra Corporation will stay with you wherever you go.";
@@ -969,7 +969,7 @@ OnRecvCastle:
 	mes "There's a small lever. Will you pull it?";
 	next;
 	if(select("Pull.", "Don't pull.") == 1) {
-		if (getcharid(2) == .@GID) {
+		if (getcharid(CHAR_ID_GUILD) == .@GID) {
 			close2;
 			warp .@destination$,.@coordinates[0],.@coordinates[1];
 			end;
diff --git a/npc/woe-fe/aldeg_cas01.txt b/npc/woe-fe/aldeg_cas01.txt
index 4472a0f46..5c76ca483 100644
--- a/npc/woe-fe/aldeg_cas01.txt
+++ b/npc/woe-fe/aldeg_cas01.txt
@@ -52,14 +52,14 @@
 		mes "ownership of this castle.";
 		close;
 	}
-	if (getcharid(2) == .@GID) {
+	if (getcharid(CHAR_ID_GUILD) == .@GID) {
 		mes "[ Echoing Voice ]";
 		mes "Brave ones...";
 		mes "Do you wish to return to your honorable place?";
 		next;
 		if(select("Return to the guild castle.", "Quit.") == 1) {
 			close2;
-			if (getcharid(2) == getcastledata("aldeg_cas01",1)) {
+			if (getcharid(CHAR_ID_GUILD) == getcastledata("aldeg_cas01",1)) {
 				warp "aldeg_cas01",218,170;
 				end;
 			}
diff --git a/npc/woe-fe/aldeg_cas02.txt b/npc/woe-fe/aldeg_cas02.txt
index 9a9182d96..e588909a1 100644
--- a/npc/woe-fe/aldeg_cas02.txt
+++ b/npc/woe-fe/aldeg_cas02.txt
@@ -52,14 +52,14 @@
 		mes "ownership of this castle.";
 		close;
 	}
-	if (getcharid(2) == .@GID) {
+	if (getcharid(CHAR_ID_GUILD) == .@GID) {
 		mes "[ Echoing Voice ]";
 		mes "Brave ones...";
 		mes "Do you wish to return to your honorable place?";
 		next;
 		if(select("Return to the guild castle.", "Quit.") == 1) {
 			close2;
-			if (getcharid(2) == getcastledata("aldeg_cas02",1)) {
+			if (getcharid(CHAR_ID_GUILD) == getcastledata("aldeg_cas02",1)) {
 				warp "aldeg_cas02",220,190;
 				end;
 			}
diff --git a/npc/woe-fe/aldeg_cas03.txt b/npc/woe-fe/aldeg_cas03.txt
index b4b1df558..a0076bfec 100644
--- a/npc/woe-fe/aldeg_cas03.txt
+++ b/npc/woe-fe/aldeg_cas03.txt
@@ -52,14 +52,14 @@
 		mes "ownership of this castle.";
 		close;
 	}
-	if (getcharid(2) == .@GID) {
+	if (getcharid(CHAR_ID_GUILD) == .@GID) {
 		mes "[ Echoing Voice ]";
 		mes "Brave ones...";
 		mes "Do you wish to return to your honorable place?";
 		next;
 		if(select("Return to the guild castle.", "Quit.") == 1) {
 			close2;
-			if (getcharid(2) == getcastledata("aldeg_cas03",1)) {
+			if (getcharid(CHAR_ID_GUILD) == getcastledata("aldeg_cas03",1)) {
 				warp "aldeg_cas03",205,186;
 				end;
 			}
diff --git a/npc/woe-fe/aldeg_cas04.txt b/npc/woe-fe/aldeg_cas04.txt
index c0289ec45..f96586f48 100644
--- a/npc/woe-fe/aldeg_cas04.txt
+++ b/npc/woe-fe/aldeg_cas04.txt
@@ -52,14 +52,14 @@
 		mes "ownership of this castle.";
 		close;
 	}
-	if (getcharid(2) == .@GID) {
+	if (getcharid(CHAR_ID_GUILD) == .@GID) {
 		mes "[ Echoing Voice ]";
 		mes "Brave ones...";
 		mes "Do you wish to return to your honorable place?";
 		next;
 		if(select("Return to the guild castle.", "Quit.") == 1) {
 			close2;
-			if (getcharid(2) == getcastledata("aldeg_cas04",1)) {
+			if (getcharid(CHAR_ID_GUILD) == getcastledata("aldeg_cas04",1)) {
 				warp "aldeg_cas04",116,217;
 				end;
 			}
diff --git a/npc/woe-fe/aldeg_cas05.txt b/npc/woe-fe/aldeg_cas05.txt
index 7a1747adb..79c5c77af 100644
--- a/npc/woe-fe/aldeg_cas05.txt
+++ b/npc/woe-fe/aldeg_cas05.txt
@@ -52,14 +52,14 @@
 		mes "ownership of this castle.";
 		close;
 	}
-	if (getcharid(2) == .@GID) {
+	if (getcharid(CHAR_ID_GUILD) == .@GID) {
 		mes "[ Echoing Voice ]";
 		mes "Brave ones...";
 		mes "Do you wish to return to your honorable place?";
 		next;
 		if(select("Return to the guild castle.", "Quit.") == 1) {
 			close2;
-			if (getcharid(2) == getcastledata("aldeg_cas05",1)) {
+			if (getcharid(CHAR_ID_GUILD) == getcastledata("aldeg_cas05",1)) {
 				warp "aldeg_cas05",167,225;
 				end;
 			}
diff --git a/npc/woe-fe/gefg_cas01.txt b/npc/woe-fe/gefg_cas01.txt
index 65ae7f1e4..364222781 100644
--- a/npc/woe-fe/gefg_cas01.txt
+++ b/npc/woe-fe/gefg_cas01.txt
@@ -52,14 +52,14 @@
 		mes "ownership of this castle.";
 		close;
 	}
-	if (getcharid(2) == .@GID) {
+	if (getcharid(CHAR_ID_GUILD) == .@GID) {
 		mes "[ Echoing Voice ]";
 		mes "Brave ones...";
 		mes "Do you wish to return to your honorable place?";
 		next;
 		if(select("Return to the guild castle.", "Quit.") == 1) {
 			close2;
-			if (getcharid(2) == getcastledata("gefg_cas01",1)) {
+			if (getcharid(CHAR_ID_GUILD) == getcastledata("gefg_cas01",1)) {
 				warp "gefg_cas01",197,36;
 				end;
 			}
diff --git a/npc/woe-fe/gefg_cas02.txt b/npc/woe-fe/gefg_cas02.txt
index 5229586df..5729b4033 100644
--- a/npc/woe-fe/gefg_cas02.txt
+++ b/npc/woe-fe/gefg_cas02.txt
@@ -52,14 +52,14 @@
 		mes "ownership of this castle.";
 		close;
 	}
-	if (getcharid(2) == .@GID) {
+	if (getcharid(CHAR_ID_GUILD) == .@GID) {
 		mes "[ Echoing Voice ]";
 		mes "Brave ones...";
 		mes "Do you wish to return to your honorable place?";
 		next;
 		if(select("Return to the guild castle.", "Quit.") == 1) {
 			close2;
-			if (getcharid(2) == getcastledata("gefg_cas02",1)) {
+			if (getcharid(CHAR_ID_GUILD) == getcastledata("gefg_cas02",1)) {
 				warp "gefg_cas02",178,43;
 				end;
 			}
diff --git a/npc/woe-fe/gefg_cas03.txt b/npc/woe-fe/gefg_cas03.txt
index f52cce240..d74692200 100644
--- a/npc/woe-fe/gefg_cas03.txt
+++ b/npc/woe-fe/gefg_cas03.txt
@@ -52,14 +52,14 @@
 		mes "ownership of this castle.";
 		close;
 	}
-	if (getcharid(2) == .@GID) {
+	if (getcharid(CHAR_ID_GUILD) == .@GID) {
 		mes "[ Echoing Voice ]";
 		mes "Brave ones...";
 		mes "Do you wish to return to your honorable place?";
 		next;
 		if(select("Return to the guild castle.", "Quit.") == 1) {
 			close2;
-			if (getcharid(2) == getcastledata("gefg_cas03",1)) {
+			if (getcharid(CHAR_ID_GUILD) == getcastledata("gefg_cas03",1)) {
 				warp "gefg_cas03",221,30;
 				end;
 			}
diff --git a/npc/woe-fe/gefg_cas04.txt b/npc/woe-fe/gefg_cas04.txt
index b15f87984..39141723f 100644
--- a/npc/woe-fe/gefg_cas04.txt
+++ b/npc/woe-fe/gefg_cas04.txt
@@ -52,14 +52,14 @@
 		mes "ownership of this castle.";
 		close;
 	}
-	if (getcharid(2) == .@GID) {
+	if (getcharid(CHAR_ID_GUILD) == .@GID) {
 		mes "[ Echoing Voice ]";
 		mes "Brave ones...";
 		mes "Do you wish to return to your honorable place?";
 		next;
 		if(select("Return to the guild castle.", "Quit.") == 1) {
 			close2;
-			if (getcharid(2) == getcastledata("gefg_cas04",1)) {
+			if (getcharid(CHAR_ID_GUILD) == getcastledata("gefg_cas04",1)) {
 				warp "gefg_cas04",168,43;
 				end;
 			}
diff --git a/npc/woe-fe/gefg_cas05.txt b/npc/woe-fe/gefg_cas05.txt
index a7722d48b..caa9a10fc 100644
--- a/npc/woe-fe/gefg_cas05.txt
+++ b/npc/woe-fe/gefg_cas05.txt
@@ -52,14 +52,14 @@
 		mes "ownership of this castle.";
 		close;
 	}
-	if (getcharid(2) == .@GID) {
+	if (getcharid(CHAR_ID_GUILD) == .@GID) {
 		mes "[ Echoing Voice ]";
 		mes "Brave ones...";
 		mes "Do you wish to return to your honorable place?";
 		next;
 		if(select("Return to the guild castle.", "Quit.") == 1) {
 			close2;
-			if (getcharid(2) == getcastledata("gefg_cas05",1)) {
+			if (getcharid(CHAR_ID_GUILD) == getcastledata("gefg_cas05",1)) {
 				warp "gefg_cas05",168,31;
 				end;
 			}
diff --git a/npc/woe-fe/payg_cas01.txt b/npc/woe-fe/payg_cas01.txt
index 0c5f54be1..d06883620 100644
--- a/npc/woe-fe/payg_cas01.txt
+++ b/npc/woe-fe/payg_cas01.txt
@@ -52,14 +52,14 @@
 		mes "ownership of this castle.";
 		close;
 	}
-	if (getcharid(2) == .@GID) {
+	if (getcharid(CHAR_ID_GUILD) == .@GID) {
 		mes "[ Echoing Voice ]";
 		mes "Brave ones...";
 		mes "Do you wish to return to your honorable place?";
 		next;
 		if(select("Return to the guild castle.", "Quit.") == 1) {
 			close2;
-			if (getcharid(2) == getcastledata("payg_cas01",1)) {
+			if (getcharid(CHAR_ID_GUILD) == getcastledata("payg_cas01",1)) {
 					warp "payg_cas01",54,144;
 				end;
 			}
diff --git a/npc/woe-fe/payg_cas02.txt b/npc/woe-fe/payg_cas02.txt
index 9666a147f..9b5b97811 100644
--- a/npc/woe-fe/payg_cas02.txt
+++ b/npc/woe-fe/payg_cas02.txt
@@ -53,14 +53,14 @@
 		mes "ownership of this castle.";
 		close;
 	}
-	if (getcharid(2) == .@GID) {
+	if (getcharid(CHAR_ID_GUILD) == .@GID) {
 		mes "[ Echoing Voice ]";
 		mes "Brave ones...";
 		mes "Do you wish to return to your honorable place?";
 		next;
 		if(select("Return to the guild castle.", "Quit.") == 1) {
 			close2;
-			if (getcharid(2) == getcastledata("payg_cas02",1)) {
+			if (getcharid(CHAR_ID_GUILD) == getcastledata("payg_cas02",1)) {
 					warp "payg_cas02",278,251;
 				end;
 			}
diff --git a/npc/woe-fe/payg_cas03.txt b/npc/woe-fe/payg_cas03.txt
index 879866a62..10b859c8f 100644
--- a/npc/woe-fe/payg_cas03.txt
+++ b/npc/woe-fe/payg_cas03.txt
@@ -52,14 +52,14 @@
 		mes "ownership of this castle.";
 		close;
 	}
-	if (getcharid(2) == .@GID) {
+	if (getcharid(CHAR_ID_GUILD) == .@GID) {
 		mes "[ Echoing Voice ]";
 		mes "Brave ones...";
 		mes "Do you wish to return to your honorable place?";
 		next;
 		if(select("Return to the guild castle.", "Quit.") == 1) {
 			close2;
-			if (getcharid(2) == getcastledata("payg_cas03",1)) {
+			if (getcharid(CHAR_ID_GUILD) == getcastledata("payg_cas03",1)) {
 					warp "payg_cas03",9,263;
 				end;
 			}
diff --git a/npc/woe-fe/payg_cas04.txt b/npc/woe-fe/payg_cas04.txt
index a6732b5b8..46f4fbb6b 100644
--- a/npc/woe-fe/payg_cas04.txt
+++ b/npc/woe-fe/payg_cas04.txt
@@ -53,14 +53,14 @@
 		mes "ownership of this castle.";
 		close;
 	}
-	if (getcharid(2) == .@GID) {
+	if (getcharid(CHAR_ID_GUILD) == .@GID) {
 		mes "[ Echoing Voice ]";
 		mes "Brave ones...";
 		mes "Do you wish to return to your honorable place?";
 		next;
 		if(select("Return to the guild castle.", "Quit.") == 1) {
 			close2;
-			if (getcharid(2) == getcastledata("payg_cas04",1)) {
+			if (getcharid(CHAR_ID_GUILD) == getcastledata("payg_cas04",1)) {
 					warp "payg_cas04",40,235;
 				end;
 			}
diff --git a/npc/woe-fe/payg_cas05.txt b/npc/woe-fe/payg_cas05.txt
index 7e5ce5aae..a2a35790a 100644
--- a/npc/woe-fe/payg_cas05.txt
+++ b/npc/woe-fe/payg_cas05.txt
@@ -52,14 +52,14 @@
 		mes "ownership of this castle.";
 		close;
 	}
-	if (getcharid(2) == .@GID) {
+	if (getcharid(CHAR_ID_GUILD) == .@GID) {
 		mes "[ Echoing Voice ]";
 		mes "Brave ones...";
 		mes "Do you wish to return to your honorable place?";
 		next;
 		if(select("Return to the guild castle.", "Quit.") == 1) {
 			close2;
-			if (getcharid(2) == getcastledata("payg_cas05",1)) {
+			if (getcharid(CHAR_ID_GUILD) == getcastledata("payg_cas05",1)) {
 					warp "payg_cas05",243,27;
 				end;
 			}
diff --git a/npc/woe-fe/prtg_cas01.txt b/npc/woe-fe/prtg_cas01.txt
index 660dd11ef..33a564fe9 100644
--- a/npc/woe-fe/prtg_cas01.txt
+++ b/npc/woe-fe/prtg_cas01.txt
@@ -52,14 +52,14 @@
 		mes "ownership of this castle.";
 		close;
 	}
-	if (getcharid(2) == .@GID) {
+	if (getcharid(CHAR_ID_GUILD) == .@GID) {
 		mes "[ Echoing Voice ]";
 		mes "Brave ones...";
 		mes "Do you wish to return to your honorable place?";
 		next;
 		if(select("Return to the guild castle.", "Quit.") == 1) {
 			close2;
-			if (getcharid(2) == getcastledata("prtg_cas01",1)) {
+			if (getcharid(CHAR_ID_GUILD) == getcastledata("prtg_cas01",1)) {
 				warp "prtg_cas01",96,173;
 				end;
 			}
diff --git a/npc/woe-fe/prtg_cas02.txt b/npc/woe-fe/prtg_cas02.txt
index 3333de0c2..6531b681f 100644
--- a/npc/woe-fe/prtg_cas02.txt
+++ b/npc/woe-fe/prtg_cas02.txt
@@ -52,14 +52,14 @@
 		mes "ownership of this castle.";
 		close;
 	}
-	if (getcharid(2) == .@GID) {
+	if (getcharid(CHAR_ID_GUILD) == .@GID) {
 		mes "[ Echoing Voice ]";
 		mes "Brave ones...";
 		mes "Do you wish to return to your honorable place?";
 		next;
 		if(select("Return to the guild castle.", "Quit.") == 1) {
 			close2;
-			if (getcharid(2) == getcastledata("prtg_cas02",1)) {
+			if (getcharid(CHAR_ID_GUILD) == getcastledata("prtg_cas02",1)) {
 				warp "prtg_cas02",169,55;
 				end;
 			}
diff --git a/npc/woe-fe/prtg_cas03.txt b/npc/woe-fe/prtg_cas03.txt
index 9040cb697..2a3879f65 100644
--- a/npc/woe-fe/prtg_cas03.txt
+++ b/npc/woe-fe/prtg_cas03.txt
@@ -52,14 +52,14 @@
 		mes "ownership of this castle.";
 		close;
 	}
-	if (getcharid(2) == .@GID) {
+	if (getcharid(CHAR_ID_GUILD) == .@GID) {
 		mes "[ Echoing Voice ]";
 		mes "Brave ones...";
 		mes "Do you wish to return to your honorable place?";
 		next;
 		if(select("Return to the guild castle.", "Quit.") == 1) {
 			close2;
-			if (getcharid(2) == getcastledata("prtg_cas03",1)) {
+			if (getcharid(CHAR_ID_GUILD) == getcastledata("prtg_cas03",1)) {
 				warp "prtg_cas03",181,215;
 				end;
 			}
diff --git a/npc/woe-fe/prtg_cas04.txt b/npc/woe-fe/prtg_cas04.txt
index 48c0f7026..3e0de365f 100644
--- a/npc/woe-fe/prtg_cas04.txt
+++ b/npc/woe-fe/prtg_cas04.txt
@@ -52,14 +52,14 @@
 		mes "ownership of this castle.";
 		close;
 	}
-	if (getcharid(2) == .@GID) {
+	if (getcharid(CHAR_ID_GUILD) == .@GID) {
 		mes "[ Echoing Voice ]";
 		mes "Brave ones...";
 		mes "Do you wish to return to your honorable place?";
 		next;
 		if(select("Return to the guild castle.", "Quit.") == 1) {
 			close2;
-			if (getcharid(2) == getcastledata("prtg_cas04",1)) {
+			if (getcharid(CHAR_ID_GUILD) == getcastledata("prtg_cas04",1)) {
 					warp "prtg_cas04",258,247;
 				end;
 			}
diff --git a/npc/woe-fe/prtg_cas05.txt b/npc/woe-fe/prtg_cas05.txt
index 8ad8c6f77..56dc902a3 100644
--- a/npc/woe-fe/prtg_cas05.txt
+++ b/npc/woe-fe/prtg_cas05.txt
@@ -52,14 +52,14 @@
 		mes "ownership of this castle.";
 		close;
 	}
-	if (getcharid(2) == .@GID) {
+	if (getcharid(CHAR_ID_GUILD) == .@GID) {
 		mes "[ Echoing Voice ]";
 		mes "Brave ones...";
 		mes "Do you wish to return to your honorable place?";
 		next;
 		if(select("Return to the guild castle.", "Quit.") == 1) {
 			close2;
-			if (getcharid(2) == getcastledata("prtg_cas05",1)) {
+			if (getcharid(CHAR_ID_GUILD) == getcastledata("prtg_cas05",1)) {
 				warp "prtg_cas05",52,41;
 				end;
 			}