Mercurial > mm7

comparison mm7_3.cpp @ 1110:cf6cd674c398

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bitwise operator ambiguity reduced
author Grumpy7
date Mon, 27 May 2013 23:05:32 +0200
parents 5d5c78088274
children 4994eb3947ae
comparison
equal deleted inserted replaced
1108:a1fd8045ffb1 1110:cf6cd674c398
3544 { 3544 {
3545 if ( v31 >= 2 ) 3545 if ( v31 >= 2 )
3546 break; 3546 break;
3547 v17 = v25; 3547 v17 = v25;
3548 v18 = word_720B40_intercepts_zs[v25 + 1]; 3548 v18 = word_720B40_intercepts_zs[v25 + 1];
3549 if ( v16 ^ v18 >= v27 ) 3549 if ( v16 ^ (v18 >= v27) )
3550 { 3550 {
3551 v19 = word_720C10_intercepts_xs[v17 + 1]; 3551 v19 = word_720C10_intercepts_xs[v17 + 1];
3552 if ( v19 >= v26 ) 3552 if ( v19 >= v26 )
3553 v20 = 0; 3553 v20 = 0;
3554 else 3554 else
3555 v20 = 2; 3555 v20 = 2;
3556 v21 = v20 | word_720C10_intercepts_xs[v17] < v26; 3556 v21 = v20 | (word_720C10_intercepts_xs[v17] < v26);
3557 if ( v21 != 3 ) 3557 if ( v21 != 3 )
3558 { 3558 {
3559 if ( !v21 3559 if ( !v21
3560 || (v22 = v19 - word_720C10_intercepts_xs[v17], 3560 || (v22 = v19 - word_720C10_intercepts_xs[v17],
3561 LODWORD(v23) = v22 << 16, 3561 LODWORD(v23) = v22 << 16,
3682 { 3682 {
3683 if ( a4d >= 2 ) 3683 if ( a4d >= 2 )
3684 break; 3684 break;
3685 v13 = v21; 3685 v13 = v21;
3686 v14 = word_7209A0_intercepts_ys_plus_ys[v21 + 1]; 3686 v14 = word_7209A0_intercepts_ys_plus_ys[v21 + 1];
3687 if ( v12 ^ v14 >= v24 ) 3687 if ( v12 ^ (v14 >= v24) )
3688 { 3688 {
3689 v15 = word_720A70_intercepts_xs_plus_xs[v13 + 1]; 3689 v15 = word_720A70_intercepts_xs_plus_xs[v13 + 1];
3690 if ( v15 >= v23 ) 3690 if ( v15 >= v23 )
3691 v16 = 0; 3691 v16 = 0;
3692 else 3692 else
3693 v16 = 2; 3693 v16 = 2;
3694 v17 = v16 | word_720A70_intercepts_xs_plus_xs[v13] < v23; 3694 v17 = v16 | (word_720A70_intercepts_xs_plus_xs[v13] < v23);
3695 if ( v17 != 3 ) 3695 if ( v17 != 3 )
3696 { 3696 {
3697 if ( !v17 3697 if ( !v17
3698 || (v18 = v15 - word_720A70_intercepts_xs_plus_xs[v13], 3698 || (v18 = v15 - word_720A70_intercepts_xs_plus_xs[v13],
3699 LODWORD(v19) = v18 << 16, 3699 LODWORD(v19) = v18 << 16,
11568 { 11568 {
11569 __int16 result; // ax@1 11569 __int16 result; // ax@1
11570 int v2; // ebx@1 11570 int v2; // ebx@1
11571 char *v3; // esi@1 11571 char *v3; // esi@1
11572 int v4; // edi@4 11572 int v4; // edi@4
11573 int v5; // ecx@4 11573 bool v5; // ecx@4
11574 SpriteFrame *v6; // eax@6 11574 SpriteFrame *v6; // eax@6
11575 SpriteFrame *v7; // edi@6 11575 SpriteFrame *v7; // edi@6
11576 int v8; // eax@6 11576 int v8; // eax@6
11577 unsigned __int16 v9; // ax@6 11577 unsigned __int16 v9; // ax@6
11578 RenderBillboardTransform_local0 v10; // [sp+Ch] [bp-5Ch]@1 11578 RenderBillboardTransform_local0 v10; // [sp+Ch] [bp-5Ch]@1
11600 result = pOtherOverlayList->pOverlays[i].field_0; 11600 result = pOtherOverlayList->pOverlays[i].field_0;
11601 if ( pOtherOverlayList->pOverlays[i].field_0 >= 300 ) 11601 if ( pOtherOverlayList->pOverlays[i].field_0 >= 300 )
11602 { 11602 {
11603 //v4 = result; 11603 //v4 = result;
11604 v5 = pOtherOverlayList->pOverlays[i].field_0 == v2 + 320 11604 v5 = pOtherOverlayList->pOverlays[i].field_0 == v2 + 320
11605 | pOtherOverlayList->pOverlays[i].field_0 == v2 + 330 | pOtherOverlayList->pOverlays[i].field_0 == v2 + 340 11605 || pOtherOverlayList->pOverlays[i].field_0 == v2 + 330
11606 | pOtherOverlayList->pOverlays[i].field_0 == v2 + 350; 11606 || pOtherOverlayList->pOverlays[i].field_0 == v2 + 340
11607 || pOtherOverlayList->pOverlays[i].field_0 == v2 + 350;
11607 pOtherOverlayList->pOverlays[i].field_0 = v2 + 310; 11608 pOtherOverlayList->pOverlays[i].field_0 = v2 + 310;
11608 if ( pOtherOverlayList->pOverlays[i].field_0 == v2 + 310 | v5 ) 11609 if ( pOtherOverlayList->pOverlays[i].field_0 == v2 + 310 || v5 )
11609 { 11610 {
11610 if ( !pOtherOverlayList->pOverlays[i].field_0 ) 11611 if ( !pOtherOverlayList->pOverlays[i].field_0 )
11611 { 11612 {
11612 v6 = pSpriteFrameTable->GetFrame(pOverlayList->pOverlays[pOtherOverlayList->pOverlays[i].field_2].uSpriteFramesetID, 11613 v6 = pSpriteFrameTable->GetFrame(pOverlayList->pOverlays[pOtherOverlayList->pOverlays[i].field_2].uSpriteFramesetID,
11613 pOtherOverlayList->pOverlays[i].field_4); 11614 pOtherOverlayList->pOverlays[i].field_4);