diff mm7_2.cpp @ 898:10fa7dad1391

DrawPaperdoll clean
author Ritor1
date Mon, 15 Apr 2013 16:36:56 +0600
parents df0ffbb70cc6
children 4dc2252e0b03
line wrap: on
line diff
--- a/mm7_2.cpp	Thu Apr 04 09:35:58 2013 +0600
+++ b/mm7_2.cpp	Mon Apr 15 16:36:56 2013 +0600
@@ -9548,8 +9548,8 @@
   _this.Reset();
   v0 = pPlayers[uActiveCharacter];
   v1 = v0->pEquipment.uMainHand;
-  v2 = v0->pEquipment.uOffHand;
-  v54 = v0->pEquipment.uOffHand;
+  v2 = v0->pEquipment.uShield;
+  v54 = v0->pEquipment.uShield;
   v53 = v1;
   if ( v1 && pItemsTable->pItems[*(int *)&v0->pInventoryItems[v1-1]].uEquipType == 1 )
     v51 = v1;
@@ -9654,7 +9654,7 @@
 			  v9 = v52;
 			  pParty->pPickedItem.uBodyAnchor = v52 + 1;
 			  memcpy(&v0->pInventoryItems[v8], &pParty->pPickedItem, sizeof(v0->pInventoryItems[v8]));
-			  *(&v0->pEquipment.uOffHand + v9) = v8 + 1;
+			  *(&v0->pEquipment.uShield + v9) = v8 + 1;
 			  pMouse->RemoveHoldingItem();
               break;
 			}
@@ -9708,7 +9708,7 @@
           v13 = v54 + 1;
           v14 = v51 == 0;
           memcpy((void *)(v12 + 532), &_this, 0x24u);
-          v0->pEquipment.uOffHand = v13;
+          v0->pEquipment.uShield = v13;
           if ( v14 )
             return;
         }
@@ -9722,7 +9722,7 @@
             pParty->pPickedItem.uBodyAnchor = 1;
             v17 = v52 + 1;
             memcpy(&v0->pInventoryItems[v52], &pParty->pPickedItem, sizeof(v0->pInventoryItems[v52]));
-            v0->pEquipment.uOffHand = v17;
+            v0->pEquipment.uShield = v17;
             pMouse->RemoveHoldingItem();
 	        return;
           }
@@ -9734,7 +9734,7 @@
           _this.uBodyAnchor = 1;
           v16 = v52 + 1;
           memcpy(&v0->pInventoryItems[v52], &_this, sizeof(v0->pInventoryItems[v52]));
-          v0->pEquipment.uOffHand = v16;
+          v0->pEquipment.uShield = v16;
         }
         v0->pEquipment.uMainHand = 0;
         return;
@@ -9790,7 +9790,7 @@
                 v21 = v54 + 1;
                 v14 = v52 == 12;
                 memcpy((void *)(v20 + 532), &_this, 0x24u);
-                v0->pEquipment.uOffHand = v21;
+                v0->pEquipment.uShield = v21;
                 if ( !v14 )
                   return;
                 v22 = _this.uItemID;
@@ -9810,7 +9810,7 @@
               pParty->pPickedItem.uBodyAnchor = 1;
               v50 = (unsigned int)&v0->pInventoryItems[v23];
               memcpy(&v0->pInventoryItems[v23], &pParty->pPickedItem, sizeof(v0->pInventoryItems[v23]));
-              v0->pEquipment.uOffHand = v23 + 1;
+              v0->pEquipment.uShield = v23 + 1;
               pMouse->RemoveHoldingItem();
               if ( v52 != 12 )
                 return;
@@ -9863,7 +9863,7 @@
         if ( v14 )
           v50 = _this.uItemID;
         if ( v51 )
-          v0->pEquipment.uOffHand = 0;
+          v0->pEquipment.uShield = 0;
         if ( v50 )
         {
                 __debugbreak();  // looks like offset in player's inventory and wand_lut much like case in 0042ECB5
@@ -9930,7 +9930,7 @@
               _this.uBodyAnchor = 2;
               v30 = v52 + 1;
               memcpy(&v0->pInventoryItems[v52], &_this, sizeof(v0->pInventoryItems[v52]));
-              v0->pEquipment.uOffHand = 0;
+              v0->pEquipment.uShield = 0;
               v0->pEquipment.uMainHand = v30;
             }
             else