diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/login.cpp | 2 | ||||
| -rw-r--r-- | src/guild.h | 24 | ||||
| -rw-r--r-- | src/net/ea/generalhandler.cpp | 1 |
3 files changed, 14 insertions, 13 deletions
diff --git a/src/gui/login.cpp b/src/gui/login.cpp index ad2eb966..ae4d8de3 100644 --- a/src/gui/login.cpp +++ b/src/gui/login.cpp @@ -56,7 +56,7 @@ LoginDialog::LoginDialog(LoginData *loginData): mKeepCheck = new CheckBox(_("Remember username"), mLoginData->remember); mRegisterButton = new Button(_("Register"), "register", this); - mServerButton = new Button(_("Select Server"), "server", this); + mServerButton = new Button(_("Change Server"), "server", this); mLoginButton = new Button(_("Login"), "login", this); mUserField->setActionEventId("login"); diff --git a/src/guild.h b/src/guild.h index be800bb2..b9e9e4b6 100644 --- a/src/guild.h +++ b/src/guild.h @@ -31,12 +31,12 @@ class Guild : public gcn::ListModel { public: /** - * Constructor with guild id passed to it + * Constructor with guild id passed to it. */ Guild(short id, short rights); /** - * Set the guild's name + * Set the guild's name. */ void setName(const std::string &name) { @@ -44,12 +44,12 @@ public: } /** - * Add member to the list + * Adds member to the list. */ void addMember(const std::string &name); /** - * Get the name of the guild + * Get the name of the guild. * @return returns name of the guild */ const std::string &getName() const @@ -58,7 +58,7 @@ public: } /** - * Get the id of the guild + * Get the id of the guild. * @return Returns the id of the guild */ short getId() const @@ -67,12 +67,12 @@ public: } /** - * Remove member from the guild + * Removes a member from the guild. */ void removeMember(const std::string &name); /** - * Get size of members list + * Get size of members list. * @return Returns the number of members in the guild. */ int getNumberOfElements() { @@ -80,18 +80,18 @@ public: } /** - * Get member at i + * Get member at \a index. * @return Returns the name of member. */ - std::string getElementAt(int i) { - return mMembers[i]; + std::string getElementAt(int index) { + return mMembers[index]; } /** - * Get whether user can invite users to this guild + * Get whether user can invite users to this guild. * @return Returns true if user can invite users */ - bool getInviteRights() + bool getInviteRights() const { return mCanInviteUsers; } diff --git a/src/net/ea/generalhandler.cpp b/src/net/ea/generalhandler.cpp index 8f02d629..b9172379 100644 --- a/src/net/ea/generalhandler.cpp +++ b/src/net/ea/generalhandler.cpp @@ -66,6 +66,7 @@ Net::GeneralHandler *generalHandler = NULL; namespace EAthena { + Token netToken; ServerInfo charServer; ServerInfo mapServer; |