Mercurial > mm7

diff Game.cpp @ 331:72de4ad353c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 19 Feb 2013 22:37:58 +0600
parents 27670273a6ff
children d720a13e2273
line wrap: on
line diff
--- a/Game.cpp	Tue Feb 19 22:37:39 2013 +0600
+++ b/Game.cpp	Tue Feb 19 22:37:58 2013 +0600
@@ -154,7 +154,7 @@
   pOtherOverlayList->bRedraw = 0;
 
   GameUI_DrawPartySpells();
-  if (v4 || pParty->pHirelings[0]._anim_end_time || pParty->pHirelings[1]._anim_end_time )
+  if (v4 || pParty->pHirelings[0].evt_C || pParty->pHirelings[1].evt_C )
     DrawHiredNPCs();
   GameUI_DrawPortraits(v4);
   GameUI_DrawLifeManaBars();
@@ -370,7 +370,7 @@
         continue;
       }
       pAudioPlayer->StopChannels(-1, -1);//    
-      memset(pParty->pHirelings, 0, 0x4Cu);
+      memset(&pParty->pHirelings[0], 0, 0x4Cu);
       memset(&pParty->pHirelings[1], 0, 0x4Cu);
       pNewNPCsCount = 0;
       if ( (signed int)pNPCStats->uNumNewNPCs > 0 )