Mercurial > mm7

diff Game.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 bdac32c645c5
children 6e39bf5f13dd
line wrap: on
line diff
--- a/Game.cpp	Mon Oct 14 03:22:34 2013 +0200
+++ b/Game.cpp	Mon Oct 14 06:32:30 2013 +0200
@@ -450,19 +450,19 @@
         pVideoPlayer->Unload();
       SaveGame(0, 0);
       ++pParty->uNumDeaths;
-      pPlayer = pParty->pPlayers;
+      pPlayer = pParty->pPlayers.data();
       do
       {
         pPlayer->SetVariable(VAR_Award, 85);
         ++pPlayer;
       }
-      while ( (signed int)pPlayer < (signed int)pParty->pHirelings );
+      while ( (signed int)pPlayer < (signed int)pParty->pHirelings.data() );
       pParty->days_played_without_rest = 0;
       pParty->uTimePlayed += 0x276000ui64;
       LOWORD(pParty->uFlags) &= ~0x204;
       pParty->SetGold(0);
       pOtherOverlayList->Reset();
-      memset(pParty->pPartyBuffs, 0, 0x140u);
+      memset(pParty->pPartyBuffs.data(), 0, 0x140u);
 
       if ( pParty->bTurnBasedModeOn == 1 )
       {