Mercurial > might-and-magic-trilogy

comparison Game.cpp @ 197:6109a4e23903

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run new game (29.12.12)
author Ritor1
date Sat, 29 Dec 2012 12:56:32 +0600
parents 8be5293b6b33
children b78cf60aaa8e
comparison
equal deleted inserted replaced
196:d5a0f3576577 197:6109a4e23903
56 uFlags2 &= 0xFFFFFFFDu; 56 uFlags2 &= 0xFFFFFFFDu;
57 if ( pParty->_497FC5_check_party_perception_against_level() ) 57 if ( pParty->_497FC5_check_party_perception_against_level() )
58 uFlags2 |= 2u; 58 uFlags2 |= 2u;
59 pIndoorCamera->sRotationX = pParty->sRotationX; 59 pIndoorCamera->sRotationX = pParty->sRotationX;
60 pIndoorCamera->sRotationY = pParty->sRotationY; 60 pIndoorCamera->sRotationY = pParty->sRotationY;
61 pIndoorCamera->pos.x = pParty->vPosition.x 61 pIndoorCamera->pos.x = pParty->vPosition.x - ((unsigned __int64)(stru_5C6E00->SinCos(pParty->sRotationY)
62 - ((unsigned __int64)(stru_5C6E00->SinCos(pParty->sRotationY)
63 * (signed __int64)pParty->field_18) >> 16); 62 * (signed __int64)pParty->field_18) >> 16);
64 pIndoorCamera->pos.y = pParty->vPosition.y 63 pIndoorCamera->pos.y = pParty->vPosition.y - ((unsigned __int64)(stru_5C6E00->SinCos(pParty->sRotationY - stru_5C6E00->uIntegerHalfPi)
65 - ((unsigned __int64)(stru_5C6E00->SinCos(
66 pParty->sRotationY - stru_5C6E00->uIntegerHalfPi)
67 * (signed __int64)pParty->field_18) >> 16); 64 * (signed __int64)pParty->field_18) >> 16);
68 pIndoorCamera->pos.z = pParty->vPosition.z + pParty->sEyelevel; 65 pIndoorCamera->pos.z = pParty->vPosition.z + pParty->sEyelevel;
69 pIndoorCamera->Initialize2(); 66 pIndoorCamera->Initialize2();
70 pIndoorCameraD3D->CreateWorldMatrixAndSomeStuff(); 67 pIndoorCameraD3D->CreateWorldMatrixAndSomeStuff();
71 pIndoorCameraD3D->_4374E8_ProllyBuildFrustrum(); 68 pIndoorCameraD3D->_4374E8_ProllyBuildFrustrum();
151 } 148 }
152 v5 = pOtherOverlayList->field_3EC; 149 v5 = pOtherOverlayList->field_3EC;
153 pOtherOverlayList->field_3EC = 0; 150 pOtherOverlayList->field_3EC = 0;
154 viewparams->bRedrawGameUI = v5; 151 viewparams->bRedrawGameUI = v5;
155 GameUI_DrawPartySpells(); 152 GameUI_DrawPartySpells();
156 if (v4 || pParty->pHirelings[0].evtc || pParty->pHirelings[1].evtc ) 153 //if (v4 || pParty->pHirelings[0].evtc || pParty->pHirelings[1].evtc ) Ritor1: it's temporarily
157 DrawHiredNPCs(); 154 //DrawHiredNPCs();
158 GameUI_DrawPortraits(v4); 155 GameUI_DrawPortraits(v4);
159 GameUI_DrawLifeManaBars(); 156 GameUI_DrawLifeManaBars();
160 GameUI_DrawCharacterSelectionFrame(); 157 GameUI_DrawCharacterSelectionFrame();
161 if ( sub_44100D() ) 158 if ( sub_44100D() )
162 draw_right_panel(); 159 draw_right_panel();
325 if ( v16 ) 322 if ( v16 )
326 { 323 {
327 v16 = 0; 324 v16 = 0;
328 viewparams->bRedrawGameUI = true; 325 viewparams->bRedrawGameUI = true;
329 } 326 }
330 pAudioPlayer->_4AAFCF(); 327 //pAudioPlayer->_4AAFCF();Ritor1: it's temporarily
331 if (uGameState == 1) 328 if (uGameState == 1)
332 goto LABEL_96; 329 goto LABEL_96;
333 if (uGameState == 2) 330 if (uGameState == 2)
334 { 331 {
335 pAudioPlayer->StopChannels(-1, -1); 332 pAudioPlayer->StopChannels(-1, -1);