From 316033d7b1495b699e1b2a301c4db7f7737a6eb4 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 5 Jan 2015 15:48:54 +0300 Subject: Add actual gender in char creation method. --- src/net/charserverhandler.h | 6 ++++-- src/net/eathena/charserverhandler.cpp | 2 +- src/net/eathena/charserverhandler.h | 9 ++++++--- src/net/tmwa/charserverhandler.cpp | 2 +- src/net/tmwa/charserverhandler.h | 9 ++++++--- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h index 2013485a4..aec583df2 100644 --- a/src/net/charserverhandler.h +++ b/src/net/charserverhandler.h @@ -56,8 +56,10 @@ class CharServerHandler notfinal virtual void chooseCharacter(Net::Character *const character) = 0; - virtual void newCharacter(const std::string &name, const int slot, - const bool gender, const int hairstyle, + virtual void newCharacter(const std::string &name, + const int slot, + const Gender::Type gender, + const int hairstyle, const int hairColor, const unsigned char race, const unsigned char look, diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp index c2292abde..12440ebb3 100644 --- a/src/net/eathena/charserverhandler.cpp +++ b/src/net/eathena/charserverhandler.cpp @@ -268,7 +268,7 @@ void CharServerHandler::chooseCharacter(Net::Character *const character) } void CharServerHandler::newCharacter(const std::string &name, const int slot, - const bool gender A_UNUSED, + const Gender::Type gender, const int hairstyle, const int hairColor, const unsigned char race A_UNUSED, const unsigned char look A_UNUSED, diff --git a/src/net/eathena/charserverhandler.h b/src/net/eathena/charserverhandler.h index d62d0a3df..a6384cbaa 100644 --- a/src/net/eathena/charserverhandler.h +++ b/src/net/eathena/charserverhandler.h @@ -45,9 +45,12 @@ class CharServerHandler final : public MessageHandler, void chooseCharacter(Net::Character *const character) override final; - void newCharacter(const std::string &name, const int slot, - const bool gender, const int hairstyle, - const int hairColor, const unsigned char race, + void newCharacter(const std::string &name, + const int slot, + const Gender::Type gender, + const int hairstyle, + const int hairColor, + const unsigned char race, const unsigned char look, const std::vector &stats) const override final; diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index af373ca77..b2b754bcb 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -268,7 +268,7 @@ void CharServerHandler::chooseCharacter(Net::Character *const character) } void CharServerHandler::newCharacter(const std::string &name, const int slot, - const bool gender A_UNUSED, + const Gender::Type gender A_UNUSED, const int hairstyle, const int hairColor, const unsigned char race, diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h index ef6afab36..0e4803b6c 100644 --- a/src/net/tmwa/charserverhandler.h +++ b/src/net/tmwa/charserverhandler.h @@ -45,9 +45,12 @@ class CharServerHandler final : public MessageHandler, void chooseCharacter(Net::Character *const character) override final; - void newCharacter(const std::string &name, const int slot, - const bool gender, const int hairstyle, - const int hairColor, const unsigned char race, + void newCharacter(const std::string &name, + const int slot, + const Gender::Type gender, + const int hairstyle, + const int hairColor, + const unsigned char race, const unsigned char look, const std::vector &stats) const override final; -- cgit v1.2.3-60-g2f50