--- a/mm7_2.cpp	Mon Feb 11 19:42:28 2013 +0200
+++ b/mm7_2.cpp	Mon Feb 11 20:23:55 2013 +0200
@@ -671,7 +671,7 @@
             do
             {
               v12 = v8->GetControl(v10)->uControlParam - 36;
-              if ( byte_4ED970_skill_learn_ability_by_class_table[v85->uClass][v12] && !v85->pActiveSkills[v12] )
+              if ( byte_4ED970_skill_learn_ability_by_class_table[v85->classType][v12] && !v85->pActiveSkills[v12] )
               {
                 v13 = pFontArrus->CalcTextHeight(pSkillNames[v12], &v79, 0, 0);
                 v89 += v13;
@@ -698,7 +698,7 @@
                   v15 = v8->GetControl(v89);
                   v16 = v15;
                   v17 = v15->uControlParam - 36;
-                  if ( !byte_4ED970_skill_learn_ability_by_class_table[v85->uClass][v17] || v85->pActiveSkills[v17] )
+                  if ( !byte_4ED970_skill_learn_ability_by_class_table[v85->classType][v17] || v85->pActiveSkills[v17] )
                   {
                     v16->uW = 0;
                     v16->uHeight = 0;
@@ -732,7 +732,7 @@
             }
           }
           v26 = pTmpBuf;
-          sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[544], v85->pName, pClassNames[v85->uClass]);
+          sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[544], v85->pName, pClassNames[v85->classType]);
           strcat(pTmpBuf, "\n \n");
           strcat(pTmpBuf, pGlobalTXT_LocalizationStrings[528]);
           goto LABEL_97;
@@ -1206,7 +1206,7 @@
           do
           {
             v35 = v30->GetControl(v33)->uControlParam - 36;
-            if ( byte_4ED970_skill_learn_ability_by_class_table[_this->uClass][v35] && !_this->pActiveSkills[v35] )
+            if ( byte_4ED970_skill_learn_ability_by_class_table[_this->classType][v35] && !_this->pActiveSkills[v35] )
             {
               v36 = pFontArrus->CalcTextHeight(pSkillNames[v35], &v101, 0, 0);
               v106.y += v36;
@@ -1218,7 +1218,7 @@
           if ( !v109 )
           {
 LABEL_105:
-            sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[544], _this->pName, pClassNames[_this->uClass]);
+            sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[544], _this->pName, pClassNames[_this->classType]);
             strcat(pTmpBuf, "\n \n");
             strcat(pTmpBuf, pGlobalTXT_LocalizationStrings[528]);
             v7 = pTmpBuf;
@@ -1247,7 +1247,7 @@
               v38 = v30->GetControl(v106.y);
               v39 = v38;
               v40 = v38->uControlParam - 36;
-              if ( !byte_4ED970_skill_learn_ability_by_class_table[_this->uClass][v40] || _this->pActiveSkills[v40] )
+              if ( !byte_4ED970_skill_learn_ability_by_class_table[_this->classType][v40] || _this->pActiveSkills[v40] )
               {
                 v39->uW = 0;
                 v39->uHeight = 0;
@@ -1946,7 +1946,7 @@
           do
           {
             v8 = v2->GetControl(v6)->uControlParam - 36;
-            if ( byte_4ED970_skill_learn_ability_by_class_table[_this->uClass][v8] && !_this->pActiveSkills[v8] )
+            if ( byte_4ED970_skill_learn_ability_by_class_table[_this->classType][v8] && !_this->pActiveSkills[v8] )
             {
               v9 = pFontArrus->CalcTextHeight(pSkillNames[v8], &v104, 0, 0);
               v112 += v9;
@@ -1974,7 +1974,7 @@
                 v11 = v2->GetControl(v112);
                 v12 = v11;
                 v13 = v11->uControlParam - 36;
-                if ( !byte_4ED970_skill_learn_ability_by_class_table[_this->uClass][v13] || _this->pActiveSkills[v13] )
+                if ( !byte_4ED970_skill_learn_ability_by_class_table[_this->classType][v13] || _this->pActiveSkills[v13] )
                 {
                   v12->uW = 0;
                   v12->uHeight = 0;
@@ -2007,7 +2007,7 @@
             return result;
           }
         }
-        sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[544], _this->pName, pClassNames[_this->uClass]);
+        sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[544], _this->pName, pClassNames[_this->classType]);
         strcat(pTmpBuf, "\n \n");
         strcat(pTmpBuf, pGlobalTXT_LocalizationStrings[528]);
         v21 = pTmpBuf;
@@ -2540,7 +2540,7 @@
         do
         {
           v41 = v37->GetControl(v39)->uControlParam - 36;
-          if ( byte_4ED970_skill_learn_ability_by_class_table[v0->uClass][v41] && !v0->pActiveSkills[v41] )
+          if ( byte_4ED970_skill_learn_ability_by_class_table[v0->classType][v41] && !v0->pActiveSkills[v41] )
           {
             v42 = pFontArrus->CalcTextHeight(pSkillNames[v41], &v144, 0, 0);
             v152 += v42;
@@ -2567,7 +2567,7 @@
               v44 = v37->GetControl(v152);
               v45 = v44;
               v46 = v44->uControlParam - 36;
-              if ( !byte_4ED970_skill_learn_ability_by_class_table[v0->uClass][v46] || v0->pActiveSkills[v46] )
+              if ( !byte_4ED970_skill_learn_ability_by_class_table[v0->classType][v46] || v0->pActiveSkills[v46] )
               {
                 v45->uW = 0;
                 v45->uHeight = 0;
@@ -2600,7 +2600,7 @@
           return;
         }
       }
-      sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[544], v0->pName, pClassNames[v0->uClass]);
+      sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[544], v0->pName, pClassNames[v0->classType]);
       strcat(pTmpBuf, "\n \n");
       strcat(pTmpBuf, pGlobalTXT_LocalizationStrings[528]);
       v11 = 0;
@@ -4543,7 +4543,7 @@
       v44 = v43 * (100 - v0->GetMerchant()) / 100;
       if ( v44 < v43 / 3 )
         v44 = v43 / 3;
-      if ( byte_4ED970_skill_learn_ability_by_class_table[v0->uClass][v42] )
+      if ( byte_4ED970_skill_learn_ability_by_class_table[v0->classType][v42] )
       {
         pSkill = &v0->pActiveSkills[v42];
         if ( !*pSkill )
@@ -5144,7 +5144,7 @@
   //for ( i = (int)pParty->pPlayers[0].pName; ; v3 = (char *)i )
   for ( i = pParty->pPlayers; ; v3 = i )
   {
-	v4 = pClassNames[v3->uClass];
+	v4 = pClassNames[v3->classType];
     v5 = v3->GetBaseLevel();
 	sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[129], i->pName, v5, v4);
     pWindow.DrawTitleText(