Mercurial > mm7
comparison CastSpellInfo.cpp @ 1646:bac69d9157b6
Merge
author | Nomad |
---|---|
date | Tue, 17 Sep 2013 23:10:07 +0200 |
parents | 7182930263b3 |
children | 3c451fd02fcf |
comparison
equal
deleted
inserted
replaced
1645:07fe868f0b44 | 1646:bac69d9157b6 |
---|---|
1347 LODWORD(v727) = v153; | 1347 LODWORD(v727) = v153; |
1348 } | 1348 } |
1349 else | 1349 else |
1350 { | 1350 { |
1351 v155 = stru_5C6E00->Cos(pParty->sRotationY); | 1351 v155 = stru_5C6E00->Cos(pParty->sRotationY); |
1352 uRequiredMana = pParty->vPosition.x + fixpoint_sub0(2048, v155); | 1352 uRequiredMana = pParty->vPosition.x + fixpoint_mul(2048, v155); |
1353 v156 = stru_5C6E00->Sin(pParty->sRotationY); | 1353 v156 = stru_5C6E00->Sin(pParty->sRotationY); |
1354 LODWORD(v727) = pParty->vPosition.y + fixpoint_sub0(2048, v156); | 1354 LODWORD(v727) = pParty->vPosition.y + fixpoint_mul(2048, v156); |
1355 v154 = pParty->vPosition.z; | 1355 v154 = pParty->vPosition.z; |
1356 } | 1356 } |
1357 unsigned __int64 k = 0; | 1357 unsigned __int64 k = 0; |
1358 int j = 0; | 1358 int j = 0; |
1359 if ( (signed int)i > 0 ) | 1359 if ( (signed int)i > 0 ) |
1654 v713 = v210; | 1654 v713 = v210; |
1655 } | 1655 } |
1656 else | 1656 else |
1657 { | 1657 { |
1658 v212 = stru_5C6E00->Cos(pParty->sRotationY); | 1658 v212 = stru_5C6E00->Cos(pParty->sRotationY); |
1659 LODWORD(v718) = pParty->vPosition.x + fixpoint_sub0(2048, v212); | 1659 LODWORD(v718) = pParty->vPosition.x + fixpoint_mul(2048, v212); |
1660 v213 = stru_5C6E00->Sin(pParty->sRotationY); | 1660 v213 = stru_5C6E00->Sin(pParty->sRotationY); |
1661 v214 = fixpoint_sub0(2048, v213); | 1661 v214 = fixpoint_mul(2048, v213); |
1662 v211 = pParty->vPosition.z; | 1662 v211 = pParty->vPosition.z; |
1663 v713 = pParty->vPosition.y + v214; | 1663 v713 = pParty->vPosition.y + v214; |
1664 v208 = LODWORD(v725); | 1664 v208 = LODWORD(v725); |
1665 } | 1665 } |
1666 signed int _v733 = 0; | 1666 signed int _v733 = 0; |