diff options
author | Philipp Sehmisch <tmw@crushnet.org> | 2008-02-22 19:58:29 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-01-05 17:28:29 +0100 |
commit | 615b1bc6080a3418b18fd4ab93b4212470709731 (patch) | |
tree | a82805bc56042899bd19620d667d890baefd7413 /src/gui | |
parent | 12d4837d4d8bb6cbb5d4cd4199bb77b76108fa51 (diff) | |
download | mana-client-615b1bc6080a3418b18fd4ab93b4212470709731.tar.gz mana-client-615b1bc6080a3418b18fd4ab93b4212470709731.tar.bz2 mana-client-615b1bc6080a3418b18fd4ab93b4212470709731.tar.xz mana-client-615b1bc6080a3418b18fd4ab93b4212470709731.zip |
Handling gender with an enum everywhere.
(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97)
Conflicts:
src/net/beinghandler.cpp
src/net/charserverhandler.cpp
src/player.cpp
src/player.h
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/char_select.cpp | 4 | ||||
-rw-r--r-- | src/gui/char_select.h | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp index d951f12e..7c067eef 100644 --- a/src/gui/char_select.cpp +++ b/src/gui/char_select.cpp @@ -74,7 +74,7 @@ void CharDeleteConfirm::action(const gcn::ActionEvent &event) CharSelectDialog::CharSelectDialog(Network *network, LockedArray<LocalPlayer*> *charInfo, - unsigned char gender): + Gender gender): Window("Select Character"), mNetwork(network), mCharInfo(charInfo), mGender(gender), mCharSelected(false) { @@ -249,7 +249,7 @@ bool CharSelectDialog::selectByName(const std::string &name) } CharCreateDialog::CharCreateDialog(Window *parent, int slot, Network *network, - unsigned char gender): + Gender gender): Window("Create Character", true, parent), mNetwork(network), mSlot(slot) { mPlayer = new Player(0, 0, NULL); diff --git a/src/gui/char_select.h b/src/gui/char_select.h index 0890bea9..22c247b6 100644 --- a/src/gui/char_select.h +++ b/src/gui/char_select.h @@ -26,6 +26,7 @@ #include "../guichanfwd.h" #include "../lockedarray.h" +#include "../being.h" #include <guichan/actionlistener.hpp> @@ -48,7 +49,7 @@ class CharSelectDialog : public Window, public gcn::ActionListener */ CharSelectDialog(Network *network, LockedArray<LocalPlayer*> *charInfo, - unsigned char gender); + Gender gender); void action(const gcn::ActionEvent &event); @@ -76,7 +77,7 @@ class CharSelectDialog : public Window, public gcn::ActionListener PlayerBox *mPlayerBox; - unsigned char mGender; + Gender mGender; bool mCharSelected; /** @@ -102,7 +103,7 @@ class CharCreateDialog : public Window, public gcn::ActionListener * Constructor. */ CharCreateDialog(Window *parent, int slot, Network *network, - unsigned char gender); + Gender gender); /** * Destructor. |