summaryrefslogtreecommitdiff
path: root/src/gui/char_select.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-27 21:13:02 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-27 21:13:02 +0100
commit60f10c242fc4f99b0ab0f8d8c6d4b4acde0022cd (patch)
tree2a3f33bb7af2bf88998a5337e1a739ea12712519 /src/gui/char_select.h
parent712ca58c011123505c807266dcc8d9d84ca1aa44 (diff)
downloadmana-60f10c242fc4f99b0ab0f8d8c6d4b4acde0022cd.tar.gz
mana-60f10c242fc4f99b0ab0f8d8c6d4b4acde0022cd.tar.bz2
mana-60f10c242fc4f99b0ab0f8d8c6d4b4acde0022cd.tar.xz
mana-60f10c242fc4f99b0ab0f8d8c6d4b4acde0022cd.zip
Clean up of most of the Network pointers
Now that messages can be sent without requiring a pointer to the Network instance, a lot of cleanup was possible.
Diffstat (limited to 'src/gui/char_select.h')
-rw-r--r--src/gui/char_select.h14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index b29953d3..cf770010 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.h
@@ -32,8 +32,6 @@
#ifdef TMWSERV_SUPPORT
#include "../logindata.h"
-#else
-class Network;
#endif
class LocalPlayer;
@@ -56,8 +54,7 @@ class CharSelectDialog : public Window, public gcn::ActionListener
CharSelectDialog(LockedArray<LocalPlayer*> *charInfo,
LoginData *loginData);
#else
- CharSelectDialog(Network *network,
- LockedArray<LocalPlayer*> *charInfo,
+ CharSelectDialog(LockedArray<LocalPlayer*> *charInfo,
Gender gender);
#endif
@@ -70,9 +67,6 @@ class CharSelectDialog : public Window, public gcn::ActionListener
bool selectByName(const std::string &name);
private:
-#ifdef EATHENA_SUPPORT
- Network *mNetwork;
-#endif
LockedArray<LocalPlayer*> *mCharInfo;
gcn::Button *mSelectButton;
@@ -129,8 +123,7 @@ class CharCreateDialog : public Window, public gcn::ActionListener
#ifdef TMWSERV_SUPPORT
CharCreateDialog(Window *parent, int slot);
#else
- CharCreateDialog(Window *parent, int slot, Network *network,
- Gender gender);
+ CharCreateDialog(Window *parent, int slot, Gender gender);
#endif
/**
@@ -162,9 +155,6 @@ class CharCreateDialog : public Window, public gcn::ActionListener
*/
void attemptCharCreate();
-#ifdef EATHENA_SUPPORT
- Network *mNetwork;
-#endif
gcn::TextField *mNameField;
gcn::Label *mNameLabel;
gcn::Button *mNextHairColorButton;