Mercurial > mm7

comparison 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
comparison
equal deleted inserted replaced
330:2503214e5258 331:72de4ad353c6
152 152
153 viewparams->bRedrawGameUI = pOtherOverlayList->bRedraw; 153 viewparams->bRedrawGameUI = pOtherOverlayList->bRedraw;
154 pOtherOverlayList->bRedraw = 0; 154 pOtherOverlayList->bRedraw = 0;
155 155
156 GameUI_DrawPartySpells(); 156 GameUI_DrawPartySpells();
157 if (v4 || pParty->pHirelings[0]._anim_end_time || pParty->pHirelings[1]._anim_end_time ) 157 if (v4 || pParty->pHirelings[0].evt_C || pParty->pHirelings[1].evt_C )
158 DrawHiredNPCs(); 158 DrawHiredNPCs();
159 GameUI_DrawPortraits(v4); 159 GameUI_DrawPortraits(v4);
160 GameUI_DrawLifeManaBars(); 160 GameUI_DrawLifeManaBars();
161 GameUI_DrawCharacterSelectionFrame(); 161 GameUI_DrawCharacterSelectionFrame();
162 if ( sub_44100D() ) 162 if ( sub_44100D() )
368 //goto LABEL_89; 368 //goto LABEL_89;
369 pRenderer->Present(); 369 pRenderer->Present();
370 continue; 370 continue;
371 } 371 }
372 pAudioPlayer->StopChannels(-1, -1);// 372 pAudioPlayer->StopChannels(-1, -1);//
373 memset(pParty->pHirelings, 0, 0x4Cu); 373 memset(&pParty->pHirelings[0], 0, 0x4Cu);
374 memset(&pParty->pHirelings[1], 0, 0x4Cu); 374 memset(&pParty->pHirelings[1], 0, 0x4Cu);
375 pNewNPCsCount = 0; 375 pNewNPCsCount = 0;
376 if ( (signed int)pNPCStats->uNumNewNPCs > 0 ) 376 if ( (signed int)pNPCStats->uNumNewNPCs > 0 )
377 { 377 {
378 pFlags = (char *)&pNPCStats->pNewNPCData[0].uFlags; 378 pFlags = (char *)&pNPCStats->pNewNPCData[0].uFlags;