Implemented 7 atribute system in character creation.

4 files changed, 13 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 4357e837..eaf241d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2007-03-11  Philipp Sehmisch  <tmw@crushnet.org>
+2007-03-16  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/gui/char_select.cpp, src/net/accountserver/account.cpp,
+	src/net/accountserver/account.hpp: Implemented 7 atribute system
+	in character creation.
+
+2007-03-11  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* src/map.cpp, src/gui/viewport.cpp: Fixed a bug that made the engine
 	not draw the last row and column of the map.
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index d5a28bec..2e994448 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -332,7 +332,8 @@ void CharCreateDialog::action(const gcn::ActionEvent &event)
                     10,  // VIT
                     10,  // INT
                     10,  // DEX
-                    10); // LUK
+                    10,  // WILL
+                    10); // CHAR
             scheduleDelete();
         }
         else {
diff --git a/src/net/accountserver/account.cpp b/src/net/accountserver/account.cpp
index 16f81f44..a90f75b8 100644
--- a/src/net/accountserver/account.cpp
+++ b/src/net/accountserver/account.cpp
@@ -32,7 +32,7 @@
 void Net::AccountServer::Account::createCharacter(
         const std::string &name, char hairStyle, char hairColor, char gender,
         short strength, short agility, short vitality,
-        short intelligence, short dexterity, short luck)
+        short intelligence, short dexterity, short willpower, short charisma)
 {
     MessageOut msg(PAMSG_CHAR_CREATE);
 
@@ -45,7 +45,8 @@ void Net::AccountServer::Account::createCharacter(
     msg.writeShort(vitality);
     msg.writeShort(intelligence);
     msg.writeShort(dexterity);
-    msg.writeShort(luck);
+    msg.writeShort(willpower);
+    msg.writeShort(charisma);
 
     Net::AccountServer::connection->send(msg);
 }
diff --git a/src/net/accountserver/account.h b/src/net/accountserver/account.h
index d3c84a15..8af75eb9 100644
--- a/src/net/accountserver/account.h
+++ b/src/net/accountserver/account.h
@@ -35,7 +35,7 @@ namespace Net
             void createCharacter(const std::string &name,
                     char hairStyle, char hairColor, char gender,
                     short strength, short agility, short vitality,
-                    short intelligence, short dexterity, short luck);
+                    short intelligence, short dexterity, short willpower, short charisma);
 
             void deleteCharacter(char slot);