Mercurial > mm7

comparison Game.cpp @ 107:23b213c3f8e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 08 Feb 2013 18:34:09 +0600
parents 2fb33d31ca0d
children fe0e317c0de0 4e35bb416dea
comparison
equal deleted inserted replaced
106:efece1632349 107:23b213c3f8e1
73 pMouse->DrawCursorToTarget(); 73 pMouse->DrawCursorToTarget();
74 } 74 }
75 else 75 else
76 { 76 {
77 if ( pParty->vPosition.x != pParty->vPrevPosition.x | pParty->sRotationY != pParty->sPrevRotationY | pParty->vPosition.y != pParty->vPrevPosition.y 77 if ( pParty->vPosition.x != pParty->vPrevPosition.x | pParty->sRotationY != pParty->sPrevRotationY | pParty->vPosition.y != pParty->vPrevPosition.y
78 | pParty->sRotationX != pParty->sPrevRotationX | pParty->vPosition.z != pParty->vPrevPosition.z | pParty->sEyelevel != pParty->sPrevEyelevel ) 78 | pParty->sRotationX != pParty->sPrevRotationX | pParty->vPosition.z != pParty->vPrevPosition.z | pParty->sEyelevel != pParty->sPrevEyelevel )
79 pParty->uFlags |= 2u; 79 pParty->uFlags |= 2u;
80 pParty->vPrevPosition = pParty->vPosition; 80 pParty->vPrevPosition = pParty->vPosition;
81 pParty->vPrevPosition.y = pParty->vPosition.y; 81 pParty->vPrevPosition.y = pParty->vPosition.y;
82 //v0 = &pRenderer; 82 //v0 = &pRenderer;
83 pParty->sPrevRotationY = pParty->sRotationY; 83 pParty->sPrevRotationY = pParty->sRotationY;
143 } 143 }
144 v5 = pOtherOverlayList->field_3EC; 144 v5 = pOtherOverlayList->field_3EC;
145 pOtherOverlayList->field_3EC = 0; 145 pOtherOverlayList->field_3EC = 0;
146 viewparams->bRedrawGameUI = v5; 146 viewparams->bRedrawGameUI = v5;
147 GameUI_DrawPartySpells(); 147 GameUI_DrawPartySpells();
148 //if (v4 || pParty->pHirelings[0].evtc || pParty->pHirelings[1].evtc ) 148 //if (v4 || pParty->pHirelings[0].evtc || pParty->pHirelings[1].evtc )
149 //DrawHiredNPCs();//Ritor1: it's temporarily 149 //DrawHiredNPCs();//Ritor1: it's temporarily
150 GameUI_DrawPortraits(v4); 150 GameUI_DrawPortraits(v4);
151 GameUI_DrawLifeManaBars(); 151 GameUI_DrawLifeManaBars();
152 GameUI_DrawCharacterSelectionFrame(); 152 GameUI_DrawCharacterSelectionFrame();
153 if ( sub_44100D() ) 153 if ( sub_44100D() )