Mercurial > mm7
comparison Game.cpp @ 85:3f2d5c80e162
Слияние
author | Ritor1 |
---|---|
date | Tue, 29 Jan 2013 10:03:07 +0600 |
parents | 3b2fbcf8d9cc d56c13146285 |
children | 2fb33d31ca0d |
comparison
equal
deleted
inserted
replaced
84:3b2fbcf8d9cc | 85:3f2d5c80e162 |
---|---|
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; |
84 //pParty->vPrevPosition.z = pParty->vPosition.y; | 84 pParty->vPrevPosition.z = pParty->vPosition.z; |
85 pParty->sPrevRotationX = pParty->sRotationX; | 85 pParty->sPrevRotationX = pParty->sRotationX; |
86 pParty->sPrevEyelevel = pParty->sEyelevel; | 86 pParty->sPrevEyelevel = pParty->sEyelevel; |
87 pRenderer->BeginSceneD3D(); | 87 pRenderer->BeginSceneD3D(); |
88 | 88 |
89 if ( !pRenderer->pRenderD3D ) | 89 if ( !pRenderer->pRenderD3D ) |