diff options
| author | Philipp Sehmisch <tmw@crushnet.org> | 2008-02-22 19:58:29 +0000 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2009-01-05 20:36:46 -0700 |
| commit | b6e7b6c6cb3ea26157e3a78713cc9621dc46b2d7 (patch) | |
| tree | 67c3d0552af5661b3847ef7e397771bc101e0c7c /src/gui | |
| parent | 77db175ceabe8d05665191835d0250a927d93d32 (diff) | |
| download | mana-b6e7b6c6cb3ea26157e3a78713cc9621dc46b2d7.tar.gz mana-b6e7b6c6cb3ea26157e3a78713cc9621dc46b2d7.tar.bz2 mana-b6e7b6c6cb3ea26157e3a78713cc9621dc46b2d7.tar.xz mana-b6e7b6c6cb3ea26157e3a78713cc9621dc46b2d7.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 53cc1e8d..6a52a745 100644 --- a/src/gui/char_select.cpp +++ b/src/gui/char_select.cpp @@ -73,7 +73,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) { @@ -248,7 +248,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 63630736..d592ce48 100644 --- a/src/gui/char_select.h +++ b/src/gui/char_select.h @@ -28,6 +28,7 @@ #include "../guichanfwd.h" #include "../lockedarray.h" +#include "../being.h" class LocalPlayer; class Network; @@ -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. |