Implement TMWServ's CharHandler

Also cleanup character creation, which isn't functional at the moment.

2 files changed, 69 insertions, 5 deletions

diff --git a/src/net/tmwserv/charserverhandler.cpp b/src/net/tmwserv/charserverhandler.cpp
index 0779e499..9739367b 100644
--- a/src/net/tmwserv/charserverhandler.cpp
+++ b/src/net/tmwserv/charserverhandler.cpp
@@ -24,6 +24,9 @@
 #include "net/tmwserv/connection.h"
 #include "net/tmwserv/protocol.h"
 
+#include "net/tmwserv/accountserver/accountserver.h"
+#include "net/tmwserv/accountserver/account.h"
+
 #include "net/messagein.h"
 
 #include "game.h"
@@ -32,12 +35,18 @@
 #include "logindata.h"
 #include "main.h"
 
+#include "gui/charcreatedialog.h"
 #include "gui/ok_dialog.h"
-#include "gui/char_select.h"
+
+#include "utils/gettext.h"
 
 extern Net::Connection *gameServerConnection;
 extern Net::Connection *chatServerConnection;
 
+Net::CharHandler *charHandler;
+
+namespace TmwServ {
+
 CharServerHandler::CharServerHandler():
     mCharCreateDialog(0)
 {
@@ -49,6 +58,7 @@ CharServerHandler::CharServerHandler():
         0
     };
     handledMessages = _messages;
+    charHandler = this;
 }
 
 void CharServerHandler::handleMessage(MessageIn &msg)
@@ -226,3 +236,46 @@ LocalPlayer* CharServerHandler::readPlayerData(MessageIn &msg, int &slot)
 
     return tempPlayer;
 }
+
+void CharServerHandler::setCharCreateDialog(CharCreateDialog *window)
+{
+    mCharCreateDialog = window;
+
+    if (!mCharCreateDialog) return;
+
+    std::vector<std::string> attributes;
+    attributes.push_back(_("Strength:"));
+    attributes.push_back(_("Agility:"));
+    attributes.push_back(_("Dexterity:"));
+    attributes.push_back(_("Vitality:"));
+    attributes.push_back(_("Intelligence:"));
+    attributes.push_back(_("Willpower:"));
+
+    mCharCreateDialog->setAttributes(attributes, 60, 1, 20);
+}
+
+void CharServerHandler::chooseCharacter(int slot, LocalPlayer* character)
+{
+    Net::AccountServer::Account::selectCharacter(slot);
+}
+
+void CharServerHandler::newCharacter(const std::string &name, int slot, bool gender,
+                  int hairstyle, int hairColor, std::vector<int> stats)
+{
+    Net::AccountServer::Account::createCharacter(name, hairstyle, hairColor,
+                    gender,
+                    stats[0],  // STR
+                    stats[1],  // AGI
+                    stats[2],  // DEX
+                    stats[3],  // VIT
+                    stats[4],  // INT
+                    stats[5]   // WILL
+                );
+}
+
+void CharServerHandler::deleteCharacter(int slot, LocalPlayer* character)
+{
+    Net::AccountServer::Account::deleteCharacter(slot);
+}
+
+} // namespace TmwServ
diff --git a/src/net/tmwserv/charserverhandler.h b/src/net/tmwserv/charserverhandler.h
index e1e13b55..a5e1fa50 100644
--- a/src/net/tmwserv/charserverhandler.h
+++ b/src/net/tmwserv/charserverhandler.h
@@ -22,18 +22,20 @@
 #ifndef NET_TMWSERV_CHARSERVERHANDLER_H
 #define NET_TMWSERV_CHARSERVERHANDLER_H
 
+#include "net/charhandler.h"
 #include "net/messagehandler.h"
 
 #include "lockedarray.h"
 
-class CharCreateDialog;
 class LocalPlayer;
 class LoginData;
 
+namespace TmwServ {
+
 /**
  * Deals with incoming messages related to character selection.
  */
-class CharServerHandler : public MessageHandler
+class CharServerHandler : public MessageHandler, public Net::CharHandler
 {
     public:
         CharServerHandler();
@@ -50,8 +52,15 @@ class CharServerHandler : public MessageHandler
          * 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; }
+        void setCharCreateDialog(CharCreateDialog *window);
+
+        void chooseCharacter(int slot, LocalPlayer* character);
+
+        void newCharacter(const std::string &name, int slot,
+                        bool gender, int hairstyle, int hairColor,
+                        std::vector<int> stats);
+
+        void deleteCharacter(int slot, LocalPlayer* character);
 
     protected:
         void handleCharCreateResponse(MessageIn &msg);
@@ -65,4 +74,6 @@ class CharServerHandler : public MessageHandler
         readPlayerData(MessageIn &msg, int &slot);
 };
 
+} // namespace TmwServ
+
 #endif