Typo. Move get_race declaration.

3 files changed, 48 insertions, 47 deletions

diff --git a/npc/functions/barber.txt b/npc/functions/barber.txt
index 123723fa..c7004eb8 100644
--- a/npc/functions/barber.txt
+++ b/npc/functions/barber.txt
@@ -130,7 +130,7 @@ function	script	BarberChangeGender	{
 function	script	BarberChangeRace	{
 
     mes l("What's your race?");
-    menuint(
+    menuint
         get_race(GETRACE_FULL, KaizeiViro), KaizeiViro,
         get_race(GETRACE_FULL, ArgaesViro), ArgaesViro,
         get_race(GETRACE_FULL, TonoriViro), TonoriViro,
diff --git a/npc/functions/main.txt b/npc/functions/main.txt
index c8a37b1c..9618e47e 100644
--- a/npc/functions/main.txt
+++ b/npc/functions/main.txt
@@ -222,3 +222,50 @@ function	script	getmercenarylink	{
 function	script	gethomunculuslink	{
     return "[@@h" + getarg(0) + "|@@]";
 }
+
+// Returns the player race in plain text
+// GETRACE_RACE - returns player race (default)
+// GETRACE_SKIN - returns player skin
+// GETRACE_FULL - returns player skin + race
+// Can take an optional 2nd param with the class
+// get_race( {Flag, {Class}} )
+function	script	get_race	{
+    .@m=getarg(0, GETRACE_RACE);
+    .@g=getarg(1, Class);
+
+    // We also allow this to run without player attached for... science.
+    if (playerattached())
+    {
+        setarray .@allraces$, l("Viro"), l("Viro"), l("Viro"),
+                              l("Ukar"), l("Ukar"),
+                              l("Tritan"), l("Tritan"),
+                              l("Raijin"), l("Raijin"),
+                              l("Kralog"), l("Kralog");
+        setarray .@allskins$, l("Kaizei"), l("Argaes"), l("Tonori"),
+                              l("Cave"), l("Mountain"),
+                              l("Sea"), l("Lake"),
+                              l("Light"), l("Dark"),
+                              l("Fire"), l("Frost");
+    }
+    else
+    {
+        setarray .@allraces$, ("Viro"), ("Viro"), ("Viro"),
+                              ("Ukar"), ("Ukar"),
+                              ("Tritan"), ("Tritan"),
+                              ("Raijin"), ("Raijin"),
+                              ("Kralog"), ("Kralog");
+        setarray .@allskins$, ("Kaizei"), ("Argaes"), ("Tonori"),
+                              ("Cave"), ("Mountain"),
+                              ("Sea"), ("Lake"),
+                              ("Light"), ("Dark"),
+                              ("Fire"), ("Frost");
+    }
+
+    if (.@m == GETRACE_RACE)
+        return .@allraces$[.@g];
+    else if  (.@m == GETRACE_SKIN)
+        return .@allskins$[.@g];
+    else
+        return .@allskins$[.@g] + " " + .@allraces$[.@g];
+}
+
diff --git a/npc/functions/util.txt b/npc/functions/util.txt
index 0403995a..49801982 100644
--- a/npc/functions/util.txt
+++ b/npc/functions/util.txt
@@ -70,52 +70,6 @@ function	script	getmap	{
     return getmapname();
 }
 
-// Returns the player race in plain text
-// GETRACE_RACE - returns player race (default)
-// GETRACE_SKIN - returns player skin
-// GETRACE_FULL - returns player skin + race
-// Can take an optional 2nd param with the class
-// get_race( {Flag, {Class}} )
-function	script	get_race	{
-    .@m=getarg(0, GETRACE_RACE);
-    .@g=getarg(1, Class);
-
-    // We also allow this to run without player attached for... science.
-    if (playerattached())
-    {
-        setarray .@allraces$, l("Viro"), l("Viro"), l("Viro"),
-                              l("Ukar"), l("Ukar"),
-                              l("Tritan"), l("Tritan"),
-                              l("Raijin"), l("Raijin"),
-                              l("Kralog"), l("Kralog");
-        setarray .@allskins$, l("Kaizei"), l("Argaes"), l("Tonori"),
-                              l("Cave"), l("Mountain"),
-                              l("Sea"), l("Lake"),
-                              l("Light"), l("Dark"),
-                              l("Fire"), l("Frost");
-    }
-    else
-    {
-        setarray .@allraces$, ("Viro"), ("Viro"), ("Viro"),
-                              ("Ukar"), ("Ukar"),
-                              ("Tritan"), ("Tritan"),
-                              ("Raijin"), ("Raijin"),
-                              ("Kralog"), ("Kralog");
-        setarray .@allskins$, ("Kaizei"), ("Argaes"), ("Tonori"),
-                              ("Cave"), ("Mountain"),
-                              ("Sea"), ("Lake"),
-                              ("Light"), ("Dark"),
-                              ("Fire"), ("Frost");
-    }
-
-    if (.@m == GETRACE_RACE)
-        return .@allraces$[.@g];
-    else if  (.@m == GETRACE_SKIN)
-        return .@allskins$[.@g];
-    else
-        return .@allskins$[.@g] + " " + .@allraces$[.@g];
-}
-
 // gettimeparam(GETTIME_X)
 //   Returns the number of seconds/minutes/hours/days/months/years since 01/01/1970
 //   This is for truly daily quests, which doesn't imposes a timed wait in hours