diff Player.cpp @ 2276:e2433db49428

ActorHasItems
author Ritor1
date Fri, 14 Mar 2014 10:47:22 +0600
parents aff7a7b072b7
children 69661f22ff03
line wrap: on
line diff
--- a/Player.cpp	Fri Mar 14 09:32:42 2014 +0600
+++ b/Player.cpp	Fri Mar 14 10:47:22 2014 +0600
@@ -2021,12 +2021,12 @@
       enchBonusSum = 0;
       for (int i = 0; i < v7; i++)
         enchBonusSum += rand() % StealingEnchantmentBonusForSkill[stealingMastery] + 1;
-      if ( actroPtr->array_000234[3].GetItemEquipType() != EQUIP_GOLD )
+      if ( actroPtr->ActorHasItems[3].GetItemEquipType() != EQUIP_GOLD )
         return 2;
-      enchTypePtr = &actroPtr->array_000234[3].uSpecEnchantmentType;
+      enchTypePtr = &actroPtr->ActorHasItems[3].uSpecEnchantmentType;
       if ( (int)enchBonusSum >= *enchTypePtr )
       {
-        actroPtr->array_000234[3].uItemID = 0;
+        actroPtr->ActorHasItems[3].uItemID = 0;
         *enchTypePtr = 0;
       }
       else
@@ -2048,7 +2048,7 @@
       int i;
       for (i = 0; i < 4; i++)
       {
-        if ( actroPtr->array_000234[i].uItemID != 0 && actroPtr->array_000234[i].GetItemEquipType() != EQUIP_GOLD )
+        if ( actroPtr->ActorHasItems[i].uItemID != 0 && actroPtr->ActorHasItems[i].GetItemEquipType() != EQUIP_GOLD )
           break;
       }
       if (i == 4)
@@ -2068,7 +2068,7 @@
         }
         else
         {
-          ItemGen* itemToSteal = &actroPtr->array_000234[rand() % 4];
+          ItemGen* itemToSteal = &actroPtr->ActorHasItems[rand() % 4];
           memcpy(&tempItem, itemToSteal, sizeof(tempItem));
           itemToSteal->Reset();
           carriedItemId = tempItem.uItemID;
@@ -2413,11 +2413,11 @@
         break;
       case SPECIAL_ATTACK_STEAL:
         PlaySound(SPEECH_40, 0);
-        v27 = pActor->array_000234;
-        if ( pActor->array_000234[0].uItemID )
+        v27 = pActor->ActorHasItems;
+        if ( pActor->ActorHasItems[0].uItemID )
         {
-          v27 = &pActor->array_000234[1];
-          if ( pActor->array_000234[1].uItemID )
+          v27 = &pActor->ActorHasItems[1];
+          if ( pActor->ActorHasItems[1].uItemID )
           {
             pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3);
             return 1;