1 files changed, 21 insertions, 11 deletions

diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index dd7c3a4e..5cf8c51f 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -45,9 +45,14 @@ struct SkillInfo {
     bool modifiable;
 };
 
+static const SkillInfo fakeSkillInfo = {
+    _("Mystery Skill"),
+    false
+};
+
 std::vector<SkillInfo> skill_db;
 
-static void initSkillinfo(void);
+static void initSkillinfo();
 
 class SkillGuiTableModel : public StaticTableModel
 {
@@ -73,15 +78,13 @@ public:
         return 35;
     }
 
-    virtual int getRowHeight(void)
+    virtual int getRowHeight()
     {
         return 12;
     }
 
-    virtual void update(void)
+    virtual void update()
     {
-	static const SkillInfo fakeSkillInfo = { _("???"), false };
-
         mEntriesNr = mDialog->getSkills().size();
         resize();
 
@@ -112,7 +115,6 @@ public:
         }
     }
 
-
 private:
     SkillDialog *mDialog;
     int mEntriesNr;
@@ -172,10 +174,18 @@ void SkillDialog::action(const gcn::ActionEvent &event)
         if (selectedSkill >= 0)
             player_node->raiseSkill(mSkillList[selectedSkill]->id);
     }
-    else if (event.getId() == "skill")
+    else if (event.getId() == "skill" && mTable->getSelectedRow() > -1)
     {
-        mIncButton->setEnabled(mTable->getSelectedRow() > -1 &&
-                               player_node->mSkillPoint > 0);
+        SKILL *skill = mSkillList[mTable->getSelectedRow()];
+        SkillInfo const *info;
+
+        if (skill->id >= 0 && (unsigned int) skill->id < skill_db.size())
+            info = &skill_db[skill->id];
+        else
+            info = &fakeSkillInfo;
+
+        mIncButton->setEnabled(player_node->mSkillPoint > 0 &&
+                               info->modifiable);
     }
     else if (event.getId() == "close")
         setVisible(false);
@@ -246,11 +256,11 @@ void SkillDialog::setSkill(int id, int lvl, int mp)
 
 void SkillDialog::cleanList()
 {
-    for_each(mSkillList.begin(), mSkillList.end(), make_dtor(mSkillList));
+    delete_all(mSkillList);
     mSkillList.clear();
 }
 
-static void initSkillinfo(void)
+static void initSkillinfo()
 {
     SkillInfo emptySkillInfo = { "", false };