summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-05 15:48:54 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-05 15:48:54 +0300
commit316033d7b1495b699e1b2a301c4db7f7737a6eb4 (patch)
tree3fb76f41146c2bb9713c2ae0e21d5654d9d09ca7 /src/net
parent5aa5429c62096034769ffdaef92a0fcb5db08301 (diff)
downloadmv-316033d7b1495b699e1b2a301c4db7f7737a6eb4.tar.gz
mv-316033d7b1495b699e1b2a301c4db7f7737a6eb4.tar.bz2
mv-316033d7b1495b699e1b2a301c4db7f7737a6eb4.tar.xz
mv-316033d7b1495b699e1b2a301c4db7f7737a6eb4.zip
Add actual gender in char creation method.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/charserverhandler.h6
-rw-r--r--src/net/eathena/charserverhandler.cpp2
-rw-r--r--src/net/eathena/charserverhandler.h9
-rw-r--r--src/net/tmwa/charserverhandler.cpp2
-rw-r--r--src/net/tmwa/charserverhandler.h9
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<int> &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<int> &stats) const override final;