Mercurial > mm7

diff Events.cpp @ 1826:bdac32c645c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changing arrays in class Player to std::array
author Grumpy7
date Wed, 09 Oct 2013 09:08:15 +0200
parents 23deb6b09c8c
children 35c1e4ff6ba7
line wrap: on
line diff
--- a/Events.cpp	Wed Oct 09 08:39:49 2013 +0200
+++ b/Events.cpp	Wed Oct 09 09:08:15 2013 +0200
@@ -953,7 +953,7 @@
             v4 = v124;
             break;
           }
-          v67 = (int)pPlayers[uActiveCharacter]->pInventoryMatrix;
+          v67 = (int)pPlayers[uActiveCharacter]->pInventoryMatrix.data();
           for ( v65 = 0; v65 < 126; ++v65 )
           {
             if ( (int)&pPlayers[uActiveCharacter]->pInventoryItemList[v67] == pValue )
@@ -980,7 +980,7 @@
           }
           for (int i = 1; i < 5; i++)
           {
-            v72 = (int)pPlayers[i]->pInventoryMatrix;
+            v72 = (int)pPlayers[i]->pInventoryMatrix.data();
             for ( int v71 = 0; v71 < 126; ++v71 )
             {
               if ( (int)&pPlayers[i]->pInventoryItemList[v72] == pValue )