Merge commit 'v1.1.11.27' into strippedstripped1.1.11.27

Conflicts:
	data/Makefile.am

1 files changed, 20 insertions, 1 deletions

diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index 0c01959f2..63e267584 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -33,8 +33,11 @@
 #include "net/ea/loginhandler.h"
 #include "net/ea/eaprotocol.h"
 
+#include "utils/dtor.h"
 #include "utils/gettext.h"
 
+#include "resources/chardb.h"
+
 #include "debug.h"
 
 extern Net::CharHandler *charHandler;
@@ -70,7 +73,17 @@ void CharServerHandler::setCharCreateDialog(CharCreateDialog *window)
     const Token &token =
         static_cast<LoginHandler*>(Net::getLoginHandler())->getToken();
 
-    mCharCreateDialog->setAttributes(attributes, 30, 1, 9);
+    int minStat = CharDB::getMinStat();
+    if (!minStat)
+        minStat = 1;
+    int maxStat = CharDB::getMaxStat();
+    if (!maxStat)
+        maxStat = 9;
+    int sumStat = CharDB::getSumStat();
+    if (!sumStat)
+        sumStat = 30;
+
+    mCharCreateDialog->setAttributes(attributes, sumStat, minStat, maxStat);
     mCharCreateDialog->setFixedGender(true, token.sex);
 }
 
@@ -172,4 +185,10 @@ void CharServerHandler::processCharDeleteFailed(Net::MessageIn &msg A_UNUSED)
     new OkDialog(_("Error"), _("Failed to delete character."));
 }
 
+void CharServerHandler::clear()
+{
+    delete_all(mCharacters);
+    mCharacters.clear();
+}
+
 } // namespace Ea