--- a/mm7_2.cpp	Tue Mar 26 14:55:43 2013 +0200
+++ b/mm7_2.cpp	Tue Mar 26 17:56:24 2013 +0200
@@ -4303,11 +4303,11 @@
   a1a.uFacing = 0;
   a1a.vPosition.z = a2->vPosition.z;
   a1a.vPosition.x = a2->vPosition.x;
-  a1a.field_50 = 0;
-  a1a.field_4C = 0;
-  a1a.field_48 = 0;
+  a1a.spell_skill = 0;
+  a1a.spell_level = 0;
+  a1a.spell_id = 0;
   a1a.field_5C = 0;
-  a1a.field_58_pid = 0;
+  a1a.spell_caster_pid = 0;
   a1a.uSpriteFrameID = 0;
   a1a.uSectorID = pIndoor->GetSector(a2->vPosition.x, a2->vPosition.y, a2->vPosition.z);;
   return a1a.Create(0, 0, 0, 0);
@@ -10991,9 +10991,9 @@
         {
           if ( stru_50C198.GetMagicalResistance(v2, 0xAu) )
           {
-			  v2->pActorBuffs[v1->field_48].Apply(
-              pParty->uTimePlayed + (signed int)(signed __int64)((double)(v1->field_4C << 7) * 0.033333335),
-              v1->field_50,
+			  v2->pActorBuffs[v1->spell_id].Apply(
+              pParty->uTimePlayed + (signed int)(signed __int64)((double)(v1->spell_level << 7) * 0.033333335),
+              v1->spell_skill,
               4u,
               0,
               0);
@@ -11170,12 +11170,12 @@
   v151 = a2 & 7;
   if ( (a2 & 7) == OBJECT_Actor)
   {
-    if ( (v2->field_58_pid & 7) == OBJECT_Actor && !pActors[v2->field_58_pid >> 3].GetActorsRelation(&pActors[a2 >> 3]) )
+    if ( (v2->spell_caster_pid & 7) == OBJECT_Actor && !pActors[v2->spell_caster_pid >> 3].GetActorsRelation(&pActors[a2 >> 3]) )
       return 1;
   }
   else
   {
-    if ( (a2 & 7) == OBJECT_Player && (v2->field_58_pid & 7) == OBJECT_Player)
+    if ( (a2 & 7) == OBJECT_Player && (v2->spell_caster_pid & 7) == OBJECT_Player)
       return 1;
   }
   if ( pParty->bTurnBasedModeOn == 1 )
@@ -11187,8 +11187,8 @@
       v2->uAttributes = v5 & 0xFFFB;
     }
   }
-  if ( v151 == OBJECT_BModel && (v2->field_58_pid & 7) != OBJECT_Player)
-    BYTE2(pActors[v2->field_58_pid >> 3].uAttributes) |= 4u;
+  if ( v151 == OBJECT_BModel && (v2->spell_caster_pid & 7) != OBJECT_Player)
+    BYTE2(pActors[v2->spell_caster_pid >> 3].uAttributes) |= 4u;
   v6 = v2->uType;
   v7 = v2->uType;
   if ( v7 > 3060 )
@@ -11246,7 +11246,7 @@
         v138 = 1;
         if ( v151 != OBJECT_Actor)
         {
-          if ( v6 != 9030 || v2->field_50 != 4 )
+          if ( v6 != 9030 || v2->spell_skill != 4 )
             goto LABEL_246;
           v2->_46BEF1_apply_spells();
 LABEL_233:
@@ -11303,9 +11303,9 @@
         v106 = v145;
         v150 = 0;
         v139 = v106 >> 3;
-        v137 = v2->field_4C;
-        v152 = v2->field_50;
-        v136 = v2->field_48;
+        v137 = v2->spell_level;
+        v152 = v2->spell_skill;
+        v136 = v2->spell_id;
         if ( v6 == 9030 )
         {
           v150 = 2;
@@ -11359,9 +11359,9 @@
               {
                 v2->_46BEF1_apply_spells();
               }
-              v2->field_4C = 0;
-              v2->field_50 = 0;
-              v2->field_48 = 0;
+              v2->spell_level = 0;
+              v2->spell_skill = 0;
+              v2->spell_id = 0;
               goto LABEL_233;
             }
             v135 = 10;
@@ -11469,7 +11469,7 @@
             v127 = v9;
             v126 = v124;
 LABEL_268:
-            v116 = word_4EE088_sound_ids[v2->field_48];
+            v116 = word_4EE088_sound_ids[v2->spell_id];
 LABEL_269:
             v125 = v116 + 1;
             goto LABEL_29;
@@ -11502,7 +11502,7 @@
           if ( !v63 )
             SpriteObject::OnInteraction(v153);
           v64 = v2->uFacing - stru_5C6E00->uIntegerDoublePi;
-          v44 = v2->field_50 == 4;
+          v44 = v2->spell_skill == 4;
           v2->vVelocity.z = 0;
           v2->vVelocity.y = 0;
           v2->vVelocity.x = 0;