comparison mm7_4.cpp @ 152:796b79187c27

Слияние
author Ritor1
date Tue, 12 Feb 2013 15:28:36 +0600
parents 9abdd40a107b 8ab4484c22e0
children 572d821561f3
comparison
equal deleted inserted replaced
151:9abdd40a107b 152:796b79187c27
14689 if ( v29 ) 14689 if ( v29 )
14690 { 14690 {
14691 LODWORD(v20) = pBLVRenderParams->field_40 << 16; 14691 LODWORD(v20) = pBLVRenderParams->field_40 << 16;
14692 HIDWORD(v20) = pBLVRenderParams->field_40 >> 16; 14692 HIDWORD(v20) = pBLVRenderParams->field_40 >> 16;
14693 v21 = v20 / x; 14693 v21 = v20 / x;
14694 v0->field_0 = (unsigned __int64)(v10->scale * v20 / x) >> 16; 14694 v0->_screenspace_x_scaler_packedfloat = (unsigned __int64)(v10->scale * v20 / x) >> 16;
14695 a5a = (unsigned __int64)(v10->scale * (signed __int64)v21) >> 16; 14695 a5a = (unsigned __int64)(v10->scale * (signed __int64)v21) >> 16;
14696 } 14696 }
14697 else 14697 else
14698 { 14698 {
14699 //v14 = &pGame->pIndoorCameraD3D; 14699 //v14 = &pGame->pIndoorCameraD3D;
14703 v0->fov_y = v15; 14703 v0->fov_y = v15;
14704 //v17 = v16 + 6.7553994e15; 14704 //v17 = v16 + 6.7553994e15;
14705 LODWORD(v18) = 0; 14705 LODWORD(v18) = 0;
14706 HIDWORD(v18) = floorf(v16 + 0.5f); 14706 HIDWORD(v18) = floorf(v16 + 0.5f);
14707 v19 = v18 / x; 14707 v19 = v18 / x;
14708 v0->field_0 = (unsigned __int64)(v10->scale * v18 / x) >> 16; 14708 v0->_screenspace_x_scaler_packedfloat = (unsigned __int64)(v10->scale * v18 / x) >> 16;
14709 a5a = (unsigned __int64)(v10->scale * (signed __int64)v19) >> 16; 14709 a5a = (unsigned __int64)(v10->scale * (signed __int64)v19) >> 16;
14710 } 14710 }
14711 v0->field_4 = a5a; 14711 v0->_screenspace_y_scaler_packedfloat = a5a;
14712 if ( (signed __int64)p->pActorBuffs[3].uExpireTime <= 0 ) 14712 if ( (signed __int64)p->pActorBuffs[3].uExpireTime <= 0 )
14713 { 14713 {
14714 if ( (signed __int64)p->pActorBuffs[10].uExpireTime > 0 ) 14714 if ( (signed __int64)p->pActorBuffs[10].uExpireTime > 0 )
14715 { 14715 {
14716 a5b = (unsigned __int64)(pGame->pStru6Instance->_4A806F(p) * (signed __int64)v0->field_4) >> 16; 14716 a5b = (unsigned __int64)(pGame->pStru6Instance->_4A806F(p) * (signed __int64)v0->_screenspace_y_scaler_packedfloat) >> 16;
14717 goto LABEL_43; 14717 goto LABEL_43;
14718 } 14718 }
14719 } 14719 }
14720 else 14720 else
14721 { 14721 {
14722 v22 = p->pActorBuffs[3].uPower; 14722 v22 = p->pActorBuffs[3].uPower;
14723 if ( v22 ) 14723 if ( v22 )
14724 { 14724 {
14725 v23 = (unsigned __int64)(65536 / (unsigned __int16)v22 * (signed __int64)v0->field_0) >> 16; 14725 v23 = (unsigned __int64)(65536 / (unsigned __int16)v22 * (signed __int64)v0->_screenspace_x_scaler_packedfloat) >> 16;
14726 v24 = p->pActorBuffs[3].uPower; 14726 v24 = p->pActorBuffs[3].uPower;
14727 v0->field_0 = v23; 14727 v0->_screenspace_x_scaler_packedfloat = v23;
14728 a5b = (unsigned __int64)(65536 / v24 * (signed __int64)v0->field_4) >> 16; 14728 a5b = (unsigned __int64)(65536 / v24 * (signed __int64)v0->_screenspace_y_scaler_packedfloat) >> 16;
14729 LABEL_43: 14729 LABEL_43:
14730 v0->field_4 = a5b; 14730 v0->_screenspace_y_scaler_packedfloat = a5b;
14731 goto LABEL_44; 14731 goto LABEL_44;
14732 } 14732 }
14733 } 14733 }
14734 LABEL_44: 14734 LABEL_44:
14735 HIWORD(v25) = HIWORD(x); 14735 HIWORD(v25) = HIWORD(x);