diff Events.cpp @ 1399:91ff22cc755b

Слияние
author Ritor1
date Thu, 18 Jul 2013 09:40:14 +0600
parents b51332ab228f
children 934074e7fcc1
line wrap: on
line diff
--- a/Events.cpp	Thu Jul 18 09:40:05 2013 +0600
+++ b/Events.cpp	Thu Jul 18 09:40:14 2013 +0600
@@ -956,10 +956,10 @@
 						v4 = v124;
 						break;
 					}
-					v67 = (int)pPlayers[uActiveCharacter]->pInventoryIndices;
+					v67 = (int)pPlayers[uActiveCharacter]->pInventoryMatrix;
 					for ( v65 = 0; v65 < 126; ++v65 )
 					{
-						if ( (int)&pPlayers[uActiveCharacter]->pInventoryItems[v67] == pValue )
+						if ( (int)&pPlayers[uActiveCharacter]->pInventoryItemList[v67] == pValue )
 						{
 							pPlayers[uActiveCharacter]->RemoveItemAtInventoryIndex(v65);
 							++curr_seq_num;
@@ -972,7 +972,7 @@
 					v69 = (int)&pPlayers[uActiveCharacter]->pEquipment;
 					for ( v68 = 0; v68 < 16; ++v68 )
 					{
-						if ( *(int *)v69 && (int)&pPlayers[uActiveCharacter]->pInventoryItems[v69] == pValue )
+						if ( *(int *)v69 && (int)&pPlayers[uActiveCharacter]->pInventoryItemList[v69] == pValue )
 						{
 							*(&pPlayers[uActiveCharacter]->pEquipment.uShield + v68) = 0;
 							++curr_seq_num;
@@ -983,10 +983,10 @@
 					}
 					for (int i = 1; i < 5; i++)
 					{
-						v72 = (int)pPlayers[i]->pInventoryIndices;
+						v72 = (int)pPlayers[i]->pInventoryMatrix;
 						for ( int v71 = 0; v71 < 126; ++v71 )
 						{
-							if ( (int)&pPlayers[i]->pInventoryItems[v72] == pValue )
+							if ( (int)&pPlayers[i]->pInventoryItemList[v72] == pValue )
 							{
 								pPlayers[i]->RemoveItemAtInventoryIndex(v71);
 								break;
@@ -995,7 +995,7 @@
 						}
 						v73 = 0;
 						v74 = (int)&pPlayers[i]->pEquipment;
-						while ( !*(int *)v74 || (int)&pPlayer->pInventoryItems[v74] != pValue )
+						while ( !*(int *)v74 || (int)&pPlayer->pInventoryItemList[v74] != pValue )
 						{
 							++v73;
 							v74 += 4;