Mercurial > mm7
comparison mm7_4.cpp @ 1110:cf6cd674c398
bitwise operator ambiguity reduced
author | Grumpy7 |
---|---|
date | Mon, 27 May 2013 23:05:32 +0200 |
parents | 5d5c78088274 |
children | 29a8defbad9e |
comparison
equal
deleted
inserted
replaced
1108:a1fd8045ffb1 | 1110:cf6cd674c398 |
---|---|
282 v13 = i; | 282 v13 = i; |
283 if (v48 == v50) | 283 if (v48 == v50) |
284 continue; | 284 continue; |
285 | 285 |
286 v14 = word_721460_xs[j + 1] >= x ? 0 : 2; | 286 v14 = word_721460_xs[j + 1] >= x ? 0 : 2; |
287 v15 = v14 | word_721460_xs[j] < x; | 287 v15 = v14 | (word_721460_xs[j] < x); |
288 | 288 |
289 if (v15 == 3) | 289 if (v15 == 3) |
290 continue; | 290 continue; |
291 else if (!v15) | 291 else if (!v15) |
292 ++v53; | 292 ++v53; |
514 v36 = word_720F70[i + 1]; | 514 v36 = word_720F70[i + 1]; |
515 v44 = word_720F70[i + 1] >= Y; | 515 v44 = word_720F70[i + 1] >= Y; |
516 if ( v43 != v44 ) | 516 if ( v43 != v44 ) |
517 { | 517 { |
518 v18 = word_721040[i + 1] >= X ? 0 : 2; | 518 v18 = word_721040[i + 1] >= X ? 0 : 2; |
519 v19 = v18 | word_721040[i] < X; | 519 v19 = v18 | (word_721040[i] < X); |
520 if ( v19 != 3 ) | 520 if ( v19 != 3 ) |
521 { | 521 { |
522 if ( !v19 ) | 522 if ( !v19 ) |
523 ++v48; | 523 ++v48; |
524 else | 524 else |
720 v4 = v31; | 720 v4 = v31; |
721 v35 = word_720CE0_ys[v12 + 1] >= v40; | 721 v35 = word_720CE0_ys[v12 + 1] >= v40; |
722 if ( v34 != v35 ) | 722 if ( v34 != v35 ) |
723 { | 723 { |
724 v13 = word_720DB0_xs[v12 + 1] >= v31 ? 0 : 2; | 724 v13 = word_720DB0_xs[v12 + 1] >= v31 ? 0 : 2; |
725 v14 = v13 | word_720DB0_xs[v12] < v31; | 725 v14 = v13 | (word_720DB0_xs[v12] < v31); |
726 if ( v14 != 3 ) | 726 if ( v14 != 3 ) |
727 { | 727 { |
728 if ( !v14 | 728 if ( !v14 |
729 || (v15 = word_720CE0_ys[v12], | 729 || (v15 = word_720CE0_ys[v12], |
730 v16 = word_720CE0_ys[v12 + 1] - v15, | 730 v16 = word_720CE0_ys[v12 + 1] - v15, |