Mercurial > mm7
comparison Actor.cpp @ 500:63b171359be2
Слияние
author | Ritor1 |
---|---|
date | Thu, 28 Feb 2013 10:36:37 +0600 |
parents | a3939d5067c4 |
children | cb0ad52d6a26 |
comparison
equal
deleted
inserted
replaced
499:511e3a6f587a | 500:63b171359be2 |
---|---|
559 } | 559 } |
560 } | 560 } |
561 v10 = v105; | 561 v10 = v105; |
562 LABEL_29: | 562 LABEL_29: |
563 spellnuma = (signed int)(60 * stru_5C6E00->uIntegerDoublePi) / 360; | 563 spellnuma = (signed int)(60 * stru_5C6E00->uIntegerDoublePi) / 360; |
564 a1.uItemType = stru_4E3ACC[15].uItemType; | 564 a1.uItemType = stru_4E3ACC[15].field_0; |
565 v118 = (signed int)(60 * stru_5C6E00->uIntegerDoublePi) / 360 / (v10 - 1); | 565 v118 = (signed int)(60 * stru_5C6E00->uIntegerDoublePi) / 360 / (v10 - 1); |
566 v11 = 0; | 566 v11 = 0; |
567 if ( (signed int)pObjectList->uNumObjects <= 0 ) | 567 if ( (signed int)pObjectList->uNumObjects <= 0 ) |
568 { | 568 { |
569 LABEL_33: | 569 LABEL_33: |
570 LOWORD(v11) = 0; | 570 LOWORD(v11) = 0; |
571 } | 571 } |
572 else | 572 else |
573 { | 573 { |
574 v12 = &pObjectList->pObjects->uObjectID; | 574 v12 = &pObjectList->pObjects->uObjectID; |
575 while ( stru_4E3ACC[15].uItemType != *v12 ) | 575 while ( stru_4E3ACC[15].field_0 != *v12 ) |
576 { | 576 { |
577 ++v11; | 577 ++v11; |
578 v12 += 28; | 578 v12 += 28; |
579 if ( v11 >= (signed int)pObjectList->uNumObjects ) | 579 if ( v11 >= (signed int)pObjectList->uNumObjects ) |
580 goto LABEL_33; | 580 goto LABEL_33; |
640 goto LABEL_222; | 640 goto LABEL_222; |
641 } | 641 } |
642 return; | 642 return; |
643 } | 643 } |
644 LABEL_159: | 644 LABEL_159: |
645 a1.uItemType = stru_4E3ACC[spellnum].uItemType; | 645 a1.uItemType = stru_4E3ACC[spellnum].field_0; |
646 v119 = 0.0; | 646 v119 = 0.0; |
647 if ( (signed int)pObjectList->uNumObjects <= 0 ) | 647 if ( (signed int)pObjectList->uNumObjects <= 0 ) |
648 { | 648 { |
649 LABEL_191: | 649 LABEL_191: |
650 v82 = 0; | 650 v82 = 0; |
788 v29 = v28; | 788 v29 = v28; |
789 v32 = stru_5C6E00->Atan2((signed __int64)v110, (signed __int64)v29); | 789 v32 = stru_5C6E00->Atan2((signed __int64)v110, (signed __int64)v29); |
790 pitch = stru_5C6E00->Atan2(v31, (signed __int64)spellnumc); | 790 pitch = stru_5C6E00->Atan2(v31, (signed __int64)spellnumc); |
791 } | 791 } |
792 a1.stru_24.Reset(); | 792 a1.stru_24.Reset(); |
793 a1.uItemType = stru_4E3ACC[9].uItemType; | 793 a1.uItemType = stru_4E3ACC[9].field_0; |
794 spellnumd = 0; | 794 spellnumd = 0; |
795 if ( (signed int)pObjectList->uNumObjects <= 0 ) | 795 if ( (signed int)pObjectList->uNumObjects <= 0 ) |
796 { | 796 { |
797 LABEL_57: | 797 LABEL_57: |
798 v34 = 0; | 798 v34 = 0; |
1332 } | 1332 } |
1333 } | 1333 } |
1334 v70 = v108; | 1334 v70 = v108; |
1335 LABEL_179: | 1335 LABEL_179: |
1336 spellnume = (signed int)(60 * stru_5C6E00->uIntegerDoublePi) / 360; | 1336 spellnume = (signed int)(60 * stru_5C6E00->uIntegerDoublePi) / 360; |
1337 a1.uItemType = stru_4E3ACC[93].uItemType; | 1337 a1.uItemType = stru_4E3ACC[SPELL_DARK_SHARPMETAL].field_0; |
1338 v116 = (signed int)(60 * stru_5C6E00->uIntegerDoublePi) / 360 / (v70 - 1); | 1338 v116 = (signed int)(60 * stru_5C6E00->uIntegerDoublePi) / 360 / (v70 - 1); |
1339 v71 = 0; | 1339 v71 = 0; |
1340 if ( (signed int)pObjectList->uNumObjects <= 0 ) | 1340 if ( (signed int)pObjectList->uNumObjects <= 0 ) |
1341 { | 1341 { |
1342 LABEL_183: | 1342 LABEL_183: |
1343 LOWORD(v71) = 0; | 1343 LOWORD(v71) = 0; |
1344 } | 1344 } |
1345 else | 1345 else |
1346 { | 1346 { |
1347 v72 = &pObjectList->pObjects->uObjectID; | 1347 v72 = &pObjectList->pObjects->uObjectID; |
1348 while ( stru_4E3ACC[93].uItemType != *v72 ) | 1348 while ( stru_4E3ACC[SPELL_DARK_SHARPMETAL].field_0 != *v72 ) |
1349 { | 1349 { |
1350 ++v71; | 1350 ++v71; |
1351 v72 += 28; | 1351 v72 += 28; |
1352 if ( v71 >= (signed int)pObjectList->uNumObjects ) | 1352 if ( v71 >= (signed int)pObjectList->uNumObjects ) |
1353 goto LABEL_183; | 1353 goto LABEL_183; |