Mercurial > mm7

comparison mm7_5.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 a1fd8045ffb1
children ca415f6bac1c
comparison
equal deleted inserted replaced
1108:a1fd8045ffb1 1110:cf6cd674c398
7117 else 7117 else
7118 v13 = 1; 7118 v13 = 1;
7119 if ( SHIDWORD(v6->pActorBuffs[6].uExpireTime) >= result 7119 if ( SHIDWORD(v6->pActorBuffs[6].uExpireTime) >= result
7120 && (SHIDWORD(v6->pActorBuffs[6].uExpireTime) > result || LODWORD(v6->pActorBuffs[6].uExpireTime) > result) ) 7120 && (SHIDWORD(v6->pActorBuffs[6].uExpireTime) > result || LODWORD(v6->pActorBuffs[6].uExpireTime) > result) )
7121 result = 1; 7121 result = 1;
7122 if ( !(v13 | result | v6->uAIState == 5 | v6->uAIState == 11 | v6->uAIState == 19) ) 7122 if ( !(v13 != 0 || result || v6->uAIState == 5 || v6->uAIState == 11 || v6->uAIState == 19) )
7123 { 7123 {
7124 v13 = ai_near_actors_targets_pid[v5]; 7124 v13 = ai_near_actors_targets_pid[v5];
7125 memcpy(&v9, Actor::GetDirectionInfo(a1, v13, &a3, 0), sizeof(v9)); 7125 memcpy(&v9, Actor::GetDirectionInfo(a1, v13, &a3, 0), sizeof(v9));
7126 v7 = v6->uAIState; 7126 v7 = v6->uAIState;
7127 if ( v7 == 6 || v7 == 1 ) 7127 if ( v7 == 6 || v7 == 1 )
7838 { 7838 {
7839 if ( a3a >= 2 ) 7839 if ( a3a >= 2 )
7840 break; 7840 break;
7841 v20 = v19; 7841 v20 = v19;
7842 v21 = dword_4F5CC4_ys[v20 + 2]; 7842 v21 = dword_4F5CC4_ys[v20 + 2];
7843 if ( v18 ^ v21 >= v8 ) 7843 if ( v18 ^ (v21 >= v8) )
7844 { 7844 {
7845 v22 = dword_4F5D98_xs[v20 + 1]; 7845 v22 = dword_4F5D98_xs[v20 + 1];
7846 if ( v22 >= a4a ) 7846 if ( v22 >= a4a )
7847 v23 = 0; 7847 v23 = 0;
7848 else 7848 else
7849 v23 = 2; 7849 v23 = 2;
7850 v24 = v23 | dword_4F5D98_xs[v20] < a4a; 7850 v24 = v23 | (dword_4F5D98_xs[v20] < a4a);
7851 if ( v24 != 3 ) 7851 if ( v24 != 3 )
7852 { 7852 {
7853 if ( !v24 7853 if ( !v24
7854 || (v25 = v22 - dword_4F5D98_xs[v20], 7854 || (v25 = v22 - dword_4F5D98_xs[v20],
7855 LODWORD(v26) = v25 << 16, 7855 LODWORD(v26) = v25 << 16,
7973 { 7973 {
7974 if ( a5a >= 2 ) 7974 if ( a5a >= 2 )
7975 break; 7975 break;
7976 v17 = v25; 7976 v17 = v25;
7977 v18 = dword_4F5B24_ys[v25 + 2]; 7977 v18 = dword_4F5B24_ys[v25 + 2];
7978 if ( v16 ^ v18 >= a3 ) 7978 if ( v16 ^ (v18 >= a3) )
7979 { 7979 {
7980 v19 = dword_4F5BF4_xs[v17 + 2]; 7980 v19 = dword_4F5BF4_xs[v17 + 2];
7981 if ( v19 >= a4a ) 7981 if ( v19 >= a4a )
7982 v20 = 0; 7982 v20 = 0;
7983 else 7983 else
7984 v20 = 2; 7984 v20 = 2;
7985 v21 = v20 | dword_4F5BF4_xs[v17 + 1] < a4a; 7985 v21 = v20 | (dword_4F5BF4_xs[v17 + 1] < a4a);
7986 if ( v21 != 3 ) 7986 if ( v21 != 3 )
7987 { 7987 {
7988 if ( !v21 7988 if ( !v21
7989 || (v22 = v19 - dword_4F5BF4_xs[v17 + 1], 7989 || (v22 = v19 - dword_4F5BF4_xs[v17 + 1],
7990 LODWORD(v23) = v22 << 16, 7990 LODWORD(v23) = v22 << 16,