From f593049cd8286f48497782d8bc0afe787724ad5d Mon Sep 17 00:00:00 2001
From: wushin <pasekei@gmail.com>
Date: Mon, 9 Nov 2015 13:46:56 -0600
Subject: Add third gender to account Add Gender to char Make gear work proper
 with new gender Enable legacy clients to use account gender

---
 src/map/atcommand.cpp | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

(limited to 'src/map/atcommand.cpp')

diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp
index 4dd80bb..11ca1a3 100644
--- a/src/map/atcommand.cpp
+++ b/src/map/atcommand.cpp
@@ -2348,12 +2348,36 @@ ATCE atcommand_char_change_sex(Session *s, dumb_ptr<map_session_data> sd,
         ZString message)
 {
     CharName character;
+    VString<1> gender;
+    int operation;
 
-    if (!asplit(message, &character))
+    if (!extract(message, record<' ', 1>(&character, &gender)))
+    {
+        clif_displaymessage(s,
+                "Please, enter a char name (usage: @charchangesex <char name> [Gender])."_s);
         return ATCE::USAGE;
-
+    }
+    else
     {
-        chrif_char_ask_name(sd->status_key.account_id, character, 5, HumanTimeDiff());
+        if (sex_from_char(gender.front()) == SEX::FEMALE)
+        {
+                operation = 5;
+        }
+        else if (sex_from_char(gender.front()) == SEX::MALE)
+        {
+                operation = 6;
+        }
+        else if (sex_from_char(gender.front()) == SEX::NEUTRAL)
+        {
+                operation = 7;
+        }
+        else
+        {
+            clif_displaymessage(s,
+                    "Please, enter a char name (usage: @charchangesex <char name> [Gender])."_s);
+            return ATCE::USAGE;
+        }
+        chrif_char_ask_name(sd->status_key.account_id, character, operation, HumanTimeDiff());
         // type: 5 - changesex
         clif_displaymessage(s, "Character name sends to char-server to ask it."_s);
     }
@@ -5215,9 +5239,9 @@ Map<XString, AtCommandInfo> atcommand_info =
     {"allstats"_s, {"[value]"_s,
         60, atcommand_all_stats,
         "Adjust all stats by value (or maximum)"_s}},
-    {"charchangesex"_s, {"<charname>"_s,
+    {"charchangesex"_s, {"<charname> <sex>"_s,
         60, atcommand_char_change_sex,
-        "Flip a characters sex and disconnect them"_s}},
+        "Change a characters sex and disconnect them"_s}},
     {"block"_s, {"<charname>"_s,
         60, atcommand_char_block,
         "Permanently block a player's account from the server"_s}},
-- 
cgit v1.2.3-60-g2f50