Mercurial > mm7

diff mm7_5.cpp @ 1861:a86c60679949

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
author Grumpy7
date Mon, 14 Oct 2013 06:32:30 +0200
parents 35c1e4ff6ba7
children 2070d01ccfae
line wrap: on
line diff
--- a/mm7_5.cpp	Mon Oct 14 03:22:34 2013 +0200
+++ b/mm7_5.cpp	Mon Oct 14 06:32:30 2013 +0200
@@ -1704,26 +1704,26 @@
               pParty->RestAndHeal();
               if ( ((pParty->uNumFoodRations - (signed int)GetTravelTime()) & 0x80000000u) != 0 )
               {
-                pPlayer7 = pParty->pPlayers;
+                pPlayer7 = pParty->pPlayers.data();
                 do
                 {
                   pPlayer7->SetCondition(1, 0);
                   ++pPlayer7;
                 }
-                while ( (signed int)pPlayer7 < (signed int)pParty->pHirelings );
+                while ( (signed int)pPlayer7 < (signed int)pParty->pHirelings.data() );
                 ++pParty->days_played_without_rest;
               }
               Party::TakeFood((unsigned int)GetTravelTime());
             }
             else
             {
-              pPlayer8 = pParty->pPlayers;
+              pPlayer8 = pParty->pPlayers.data();
               do
               {
                 pPlayer8->SetCondition(1, 0);
                 ++pPlayer8;
               }
-              while ( (signed int)pPlayer8 < (signed int)pParty->pHirelings );
+              while ( (signed int)pPlayer8 < (signed int)pParty->pHirelings.data() );
               ++pParty->days_played_without_rest;
             }
             pPaletteManager->ResetNonLocked();
@@ -3279,7 +3279,7 @@
 
   if ( pMessageQueue_50CBD0->uNumMessages )
   {
-    pPlayer = pParty->pPlayers;
+    pPlayer = pParty->pPlayers.data();
     do
     {
       int param2;
@@ -3748,7 +3748,7 @@
           if ( sub_407A1C(pParty->vPosition.x, pParty->vPosition.y, pParty->vPosition.z + pParty->sEyelevel, v25) )
           {
             v26 = 0;
-            v27 = pParty->pPlayers;//[0].pConditions[15];
+            v27 = pParty->pPlayers.data();//[0].pConditions[15];
             do
             {
 				if ( !(HIDWORD(v27->pConditions[14]) | LODWORD(v27->pConditions[14])) && !v27->pConditions[15] && !v27->pConditions[16] )