--- a/mm7_5.cpp	Mon Feb 11 19:42:28 2013 +0200
+++ b/mm7_5.cpp	Mon Feb 11 20:23:55 2013 +0200
@@ -3498,7 +3498,7 @@
           goto _sprintex_2args_draw_status_and_continue;
         case UIMSG_ShowStatus_Player:
           pPlayer5 = pPlayers[uMessageParam];
-          sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[429], pPlayer5->pName, pClassNames[pPlayer5->uClass]);// "%s the %s"
+          sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[429], pPlayer5->pName, pClassNames[pPlayer5->classType]);// "%s the %s"
           strcat(pTmpBuf, ": ");
           v107 = pPlayer5->GetMajorConditionIdx();
           strcat(pTmpBuf, aCharacterConditionNames[v107]);
@@ -4149,7 +4149,7 @@
           }
           if ( pUIMessageType == UIMSG_PlayerCreationSelectClass )
           {
-            (&pPlayer[uPlayerCreationUI_SelectedCharacter])->Reset(uNum);
+            pPlayer[uPlayerCreationUI_SelectedCharacter].Reset((PLAYER_CLASS_TYPE)uNum);
             pAudioPlayer->PlaySound((SoundID)66, 0, 0, -1, 0, 0, 0, 0);
             continue;
           }
@@ -16438,7 +16438,7 @@
       break;
 	 case 118: // Character info
       pStr = pParty->pPlayers[pButton->uControlParam].pName;
-      pWindow.Hint = pClassDescriptions[pParty->pPlayers[pButton->uControlParam].uClass];
+      pWindow.Hint = pClassDescriptions[pParty->pPlayers[pButton->uControlParam].classType];
       break;
      }
      if ( pControlID > 68 && pControlID <= 75 ) //Sellected skills info
@@ -16896,19 +16896,19 @@
   if ( (v8 & 0x3F) == (v7 & 0x3F) )
   {
     strcpy(a2, "%s\n\n");
-    v24 = sub_417AD4(pPlayer->uClass, v2, 1);
+    v24 = sub_417AD4(pPlayer->classType, v2, 1);
     sprintf(Source, format_4E2DC8, v24);
     strcat(a2, Source);
     strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
-    v25 = sub_417AD4(pPlayer->uClass, v36, 2);
+    v25 = sub_417AD4(pPlayer->classType, v36, 2);
     sprintf(Source, format_4E2DC8, v25);
     strcat(a2, Source);
     strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
-    v26 = sub_417AD4(pPlayer->uClass, v36, 3);
+    v26 = sub_417AD4(pPlayer->classType, v36, 3);
     sprintf(Source, format_4E2DC8, v26);
     strcat(a2, Source);
     strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
-    v27 = pPlayer->uClass;
+    v27 = pPlayer->classType;
     v28 = v36;
     v29 = sub_417AD4(v27, v36, 4);
     sprintf(Source, format_4E2DC8, v29);
@@ -16940,20 +16940,20 @@
   else
   {
     strcpy(a2, "%s\n\n");
-    v9 = sub_417AD4(pPlayer->uClass, v2, 1);
+    v9 = sub_417AD4(pPlayer->classType, v2, 1);
     sprintf(Source, format_4E2DC8, v9);
     strcat(a2, Source);
     strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
-    v10 = sub_417AD4(pPlayer->uClass, v36, 2);
+    v10 = sub_417AD4(pPlayer->classType, v36, 2);
     sprintf(Source, format_4E2DC8, v10);
     strcat(a2, Source);
     strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
-    v11 = sub_417AD4(pPlayer->uClass, v36, 3);
+    v11 = sub_417AD4(pPlayer->classType, v36, 3);
     sprintf(Source, format_4E2DC8, v11);
     strcat(a2, Source);
     strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
     v12 = v36;
-    v13 = sub_417AD4(pPlayer->uClass, v36, 4);
+    v13 = sub_417AD4(pPlayer->classType, v36, 4);
     sprintf(Source, format_4E2DC8, v13);
     strcat(a2, Source);
     strcat(a2, "%s\t%03d:\t%03d%s\t000\n\n");
@@ -17250,7 +17250,7 @@
       v24 = pGlobalTXT_LocalizationStrings[207];
       goto LABEL_47;
     case 26:
-      _y = (Player *)(4 * pPlayers[uActiveCharacter]->uClass);
+      _y = (Player *)(4 * pPlayers[uActiveCharacter]->classType);
       v6 = *(char **)((char *)_y->pConditions + (int)pClassNames);
       v7 = *(char **)((char *)_y->pConditions + (int)pClassDescriptions);
 LABEL_46:
@@ -17411,7 +17411,7 @@
   pRenderer->DrawTextureIndexed(8, 8, (Texture *)(v2 != -1 ? (int)&pIcons_LOD->pTextures[v2] : 0));
   v3 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
   sprintf(pTmpBuf, format_4E2DC8, v3);
-  sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[429], pPlayer->pName, pClassNames[pPlayer->uClass]);//^Pi[%s] %s
+  sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[429], pPlayer->pName, pClassNames[pPlayer->classType]);//^Pi[%s] %s
   strcat(pTmpBuf, pTmpBuf2);
   if ( pPlayer->uSkillPoints )
     v4 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xFFu, 0);
@@ -17611,7 +17611,7 @@
   v103 = v102;
   v104 = UI_GetHealthManaStringColor(v135, v102);
   sprintf(pTmpBuf, a2g, pGlobalTXT_LocalizationStrings[142], v104, v135, v103);
-  if ( pPlayer->uClass == 35 && v137 == 200 )
+  if ( pPlayer->classType == PLAYER_CLASS_LICH && v137 == 200 )
   {
     v105 = pGlobalTXT_LocalizationStrings[625];
     v106 = UI_GetHealthManaStringColor(v135, 200);
@@ -17628,7 +17628,7 @@
   v108 = v107;
   v109 = UI_GetHealthManaStringColor(v136, v107);
   sprintf(pTmpBuf, a2h, pGlobalTXT_LocalizationStrings[29], v109, v136, v108);
-  if ( pPlayer->uClass == 35 && v138 == 200 )
+  if ( pPlayer->classType == PLAYER_CLASS_LICH && v138 == 200 )
   {
     v110 = pGlobalTXT_LocalizationStrings[625];
     v111 = UI_GetHealthManaStringColor(v136, 200);