Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/Game.cpp	Fri Feb 08 18:33:54 2013 +0600
+++ b/Game.cpp	Fri Feb 08 18:34:09 2013 +0600
@@ -75,7 +75,7 @@
   else
   {
     if ( pParty->vPosition.x != pParty->vPrevPosition.x | pParty->sRotationY != pParty->sPrevRotationY | pParty->vPosition.y != pParty->vPrevPosition.y 
-		| pParty->sRotationX != pParty->sPrevRotationX | pParty->vPosition.z != pParty->vPrevPosition.z | pParty->sEyelevel != pParty->sPrevEyelevel )
+       | pParty->sRotationX != pParty->sPrevRotationX | pParty->vPosition.z != pParty->vPrevPosition.z | pParty->sEyelevel != pParty->sPrevEyelevel )
       pParty->uFlags |= 2u;
     pParty->vPrevPosition = pParty->vPosition;
     pParty->vPrevPosition.y = pParty->vPosition.y;
@@ -145,7 +145,7 @@
   pOtherOverlayList->field_3EC = 0;
   viewparams->bRedrawGameUI = v5;
   GameUI_DrawPartySpells();
-  //if (v4 || pParty->pHirelings[0].evtc || pParty->pHirelings[1].evtc ) 
+  //if (v4 || pParty->pHirelings[0].evtc || pParty->pHirelings[1].evtc )
     //DrawHiredNPCs();//Ritor1: it's temporarily
   GameUI_DrawPortraits(v4);
   GameUI_DrawLifeManaBars();