Simply don't show equipped items in sell dialog since it's annoying. Code cleanups and improvements to the login sequence.

1 files changed, 24 insertions, 6 deletions

diff --git a/src/gui/login.h b/src/gui/login.h
index 002004c4..1322a1c3 100644
--- a/src/gui/login.h
+++ b/src/gui/login.h
@@ -25,11 +25,9 @@
 #define _TMW_LOGIN_H
 
 #include <iosfwd>
-
 #include <guichan/actionlistener.hpp>
 
 #include "window.h"
-
 #include "../guichanfwd.h"
 
 /**
@@ -56,12 +54,15 @@ class LoginDialog : public Window, public gcn::ActionListener {
          */
         void action(const std::string& eventId);
 
+        // Made them public to have the possibility to request focus
+        // from external functions.
+        gcn::TextField *userField;
+        gcn::TextField *passField;
+
     private:
         gcn::Label *userLabel;
         gcn::Label *passLabel;
         gcn::Label *serverLabel;
-        gcn::TextField *userField;
-        gcn::TextField *passField;
         gcn::TextField *serverField;
         gcn::CheckBox *keepCheck;
         gcn::Button *okButton;
@@ -70,6 +71,23 @@ class LoginDialog : public Window, public gcn::ActionListener {
 };
 
 /**
+ * Listener used for handling wrong password.
+ */
+class WrongPasswordNoticeListener : public gcn::ActionListener {
+    public:
+        void action(const std::string &eventId);
+};
+
+/**
+ * Listener used for handling wrong username.
+ */
+class WrongUsernameNoticeListener : public gcn::ActionListener {
+    public:
+        void action(const std::string &eventId);
+};
+
+
+/**
  * Display login dialog
  */
 void login();
@@ -87,6 +105,8 @@ void login();
  * 9 means username already existing
  * -1 means unknown error
  */
+int attemptLogin(const std::string& user, const std::string& pass);
+
 enum
 {
     LOGIN_OK = 0,
@@ -101,6 +121,4 @@ enum
 
 };
 
-int server_login(const std::string& user, const std::string& pass);
-
 #endif