From 82c7ecf7a838c43771a676bb9311f9a1fc403f67 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Thu, 22 Mar 2007 23:53:13 +0000
Subject: Clarified the error message when character creation fails and made
 sure the character creation dialog doesn't close when creation failed.

---
 src/net/charserverhandler.h | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'src/net/charserverhandler.h')

diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h
index 16d2c361..ab4ca1c7 100644
--- a/src/net/charserverhandler.h
+++ b/src/net/charserverhandler.h
@@ -28,9 +28,13 @@
 
 #include "../lockedarray.h"
 
+class CharCreateDialog;
 class LocalPlayer;
 class LoginData;
 
+/**
+ * Deals with incoming messages from the character server.
+ */
 class CharServerHandler : public MessageHandler
 {
     public:
@@ -38,15 +42,26 @@ class CharServerHandler : public MessageHandler
 
         void handleMessage(MessageIn *msg);
 
-        void setCharInfo(LockedArray<LocalPlayer*> *charInfo) { mCharInfo = charInfo; };
+        void setCharInfo(LockedArray<LocalPlayer*> *charInfo)
+        { mCharInfo = charInfo; }
+
+        void setLoginData(LoginData *loginData)
+        { mLoginData = loginData; }
 
-        void setLoginData(LoginData *loginData) { mLoginData = loginData; };
+        /**
+         * Sets the character create dialog. The handler will clean up this
+         * dialog when a new character is succesfully created, and will unlock
+         * the dialog when a new character failed to be created.
+         */
+        void setCharCreateDialog(CharCreateDialog *window)
+        { mCharCreateDialog = window; }
 
     protected:
         LoginData *mLoginData;
         LockedArray<LocalPlayer*> *mCharInfo;
+        CharCreateDialog *mCharCreateDialog;
 
-        LocalPlayer* readPlayerData(MessageIn *msg, int &slot);
+        LocalPlayer* readPlayerData(MessageIn &msg, int &slot);
 };
 
 #endif
-- 
cgit v1.2.3-70-g09d2