1 files changed, 22 insertions, 15 deletions

diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h
index 37b378f2..08ba5102 100644
--- a/src/net/charserverhandler.h
+++ b/src/net/charserverhandler.h
@@ -1,26 +1,26 @@
 /*
  *  The Mana World
- *  Copyright (C) 2004  The Mana World Development Team
+ *  Copyright 2004 The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  The Mana World is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  The Mana World is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
+ *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NET_CHARSERVERHANDLER_H
-#define NET_CHARSERVERHANDLER_H
+#ifndef _TMW_NET_CHARSERVERHANDLER_H
+#define _TMW_NET_CHARSERVERHANDLER_H
 
 #include "messagehandler.h"
 
@@ -31,20 +31,21 @@ class LocalPlayer;
 class LoginData;
 
 /**
- * Deals with incoming messages from the character server.
+ * Deals with incoming messages related to character selection.
  */
 class CharServerHandler : public MessageHandler
 {
     public:
         CharServerHandler();
 
-        void handleMessage(MessageIn *msg);
+        void
+        handleMessage(MessageIn &msg);
 
-        void setCharInfo(LockedArray<LocalPlayer*> *charInfo)
-        { mCharInfo = charInfo; }
-
-        void setLoginData(LoginData *loginData)
-        { mLoginData = loginData; }
+        void
+        setCharInfo(LockedArray<LocalPlayer*> *charInfo)
+        {
+            mCharInfo = charInfo;
+        }
 
         /**
          * Sets the character create dialog. The handler will clean up this
@@ -55,11 +56,17 @@ class CharServerHandler : public MessageHandler
         { mCharCreateDialog = window; }
 
     protected:
-        LoginData *mLoginData;
+        void
+        handleCharCreateResponse(MessageIn &msg);
+
+        void
+        handleCharSelectResponse(MessageIn &msg);
+
         LockedArray<LocalPlayer*> *mCharInfo;
         CharCreateDialog *mCharCreateDialog;
 
-        LocalPlayer* readPlayerData(MessageIn &msg, int &slot);
+        LocalPlayer*
+        readPlayerData(MessageIn &msg, int &slot);
 };
 
 #endif