Merge branch 'master' into lpc2012

This merge reverts change 3b22c2cf170c877904dcef5a4af03ac360bd0581.

Conflicts:
	src/gui/charcreatedialog.cpp
	src/net/manaserv/manaserv_protocol.h

1 files changed, 4 insertions, 6 deletions

diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h
index 7548bbff..9f49f6c5 100644
--- a/src/gui/charcreatedialog.h
+++ b/src/gui/charcreatedialog.h
@@ -58,14 +58,12 @@ class CharCreateDialog : public Window, public gcn::ActionListener
         void unlock();
 
         void setAttributes(const std::vector<std::string> &labels,
-                           unsigned int available,
-                           unsigned int min, unsigned int max);
+                           unsigned available,
+                           unsigned min, unsigned max);
 
         void setFixedGender(bool fixed, Gender gender = GENDER_FEMALE);
 
     private:
-        int getDistributedPoints() const;
-
         void updateSliders();
 
         /**
@@ -94,13 +92,13 @@ class CharCreateDialog : public Window, public gcn::ActionListener
         gcn::RadioButton *mMale;
         gcn::RadioButton *mFemale;
 
+        std::vector<int> mAttributes;
         std::vector<gcn::Slider*> mAttributeSlider;
         std::vector<gcn::Label*> mAttributeLabel;
         std::vector<gcn::Label*> mAttributeValue;
         gcn::Label *mAttributesLeft;
 
-        int mMaxPoints;
-        int mUsedPoints;
+        unsigned mMaxPoints;
 
         gcn::Button *mCreateButton;
         gcn::Button *mCancelButton;