Mercurial > mm7

diff SpriteObject.cpp @ 1202:0dbf6c4dd029

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
arrays to std::arrays phase 1
author Grumpy7
date Sat, 08 Jun 2013 21:33:22 +0200
parents a7e63532b9a8
children 8c02e6f74b29
line wrap: on
line diff
--- a/SpriteObject.cpp	Sat Jun 08 19:34:33 2013 +0200
+++ b/SpriteObject.cpp	Sat Jun 08 21:33:22 2013 +0200
@@ -430,7 +430,7 @@
             v56 = 0;
             if ( (signed int)uNumActors > 0 )
             {
-              v60 = pActors;
+              v60 = pActors.data();
               v20 = &pActors[v19];
               do
               {
@@ -716,7 +716,7 @@
         {
           if ( (signed int)uNumActors > v8 )
           {
-            v39b = pActors;//[0].word_000086_some_monster_id;
+            v39b = pActors.data();//[0].word_000086_some_monster_id;
             do
             {
               //v41 = pActors[v1->field_58 >> 3].pMonsterInfo.uID - 1;
@@ -737,7 +737,7 @@
         {
           if ( (signed int)uNumActors > v8 )
           {
-            v39b = pActors;//[0].word_000086_some_monster_id;
+            v39b = pActors.data();//[0].word_000086_some_monster_id;
             do
             {
 				_46DF1A_collide_against_actor(v42++, pMonsterList->pMonsters[v39b->word_000086_some_monster_id-1].uToHitRadius);