diff mm7_5.cpp @ 1202:0dbf6c4dd029

arrays to std::arrays phase 1
author Grumpy7
date Sat, 08 Jun 2013 21:33:22 +0200
parents a90dc4aee8f4
children 8c02e6f74b29
line wrap: on
line diff
--- a/mm7_5.cpp	Sat Jun 08 19:34:33 2013 +0200
+++ b/mm7_5.cpp	Sat Jun 08 21:33:22 2013 +0200
@@ -1685,7 +1685,7 @@
           {
             pParty->field_6E4 = 0;
             pParty->field_6E0 = 0;
-            pCastSpellInfo->_427D48(1);
+            pCastSpellInfo.data()->_427D48(1);
             DialogueEnding();
             pEventTimer->Pause();
             pGameLoadingUI_ProgressBar->Initialize(GUIProgressBar::TYPE_Box);
@@ -3252,7 +3252,7 @@
       }
     }
   }
-  pCastSpellInfo->_427E01_cast_spell();
+  pCastSpellInfo.data()->_427E01_cast_spell();
 }
 
 //----- (004356FF) --------------------------------------------------------
@@ -4270,7 +4270,7 @@
         uActorID = 0;
         if ( (signed int)uNumActors > 0 )
         {
-          v28 = pActors;//[0].vPosition.z;
+          v28 = pActors.data();//[0].vPosition.z;
           do
           {
             if ( v28->CanAct() )
@@ -8798,7 +8798,7 @@
   Log::Warning(L"%S %S %u", __FILE__, __FUNCTION__, __LINE__); // ai_near_actors_targets_pid[i] for AI_Stand seems always 0;  original code behaviour is identical
   for (uint i = 0; i < uNumActors; ++i)
   {
-    auto actor = pActors + i;
+    auto actor = &pActors[i];
 
     if (actor->CanAct() || actor->uAIState == Disabled)
     {
@@ -8881,7 +8881,7 @@
   v8 = v2;
   if ( (signed int)uNumActors > 0 )
   {
-    v5 = pActors;
+    v5 = pActors.data();
     do
     {
       v6 = v5->uAttributes;
@@ -8918,7 +8918,7 @@
   v9 = 0;
   if ( (signed int)uNumActors > 0 )
   {
-    v4 = pActors;//[0].pMonsterInfo.uID;
+    v4 = pActors.data();//[0].pMonsterInfo.uID;
     do
     {
 	  v5 = v4->uAttributes;                // actor::attributes
@@ -8958,7 +8958,7 @@
   v9 = 0;
   if ( (signed int)uNumActors > 0 )
   {
-    v4 = pActors;//[0].uGroup;
+    v4 = pActors.data();//[0].uGroup;
     do
     {
 	  v5 = v4->uAttributes;