Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/mm7_5.cpp	Mon May 27 22:25:27 2013 +0200
+++ b/mm7_5.cpp	Mon May 27 23:05:32 2013 +0200
@@ -7119,7 +7119,7 @@
         if ( SHIDWORD(v6->pActorBuffs[6].uExpireTime) >= result
           && (SHIDWORD(v6->pActorBuffs[6].uExpireTime) > result || LODWORD(v6->pActorBuffs[6].uExpireTime) > result) )
           result = 1;
-        if ( !(v13 | result | v6->uAIState == 5 | v6->uAIState == 11 | v6->uAIState == 19) )
+        if ( !(v13 != 0 || result || v6->uAIState == 5 || v6->uAIState == 11 || v6->uAIState == 19) )
         {
           v13 = ai_near_actors_targets_pid[v5];
           memcpy(&v9, Actor::GetDirectionInfo(a1, v13, &a3, 0), sizeof(v9));
@@ -7840,14 +7840,14 @@
       break;
     v20 = v19;
     v21 = dword_4F5CC4_ys[v20 + 2];
-    if ( v18 ^ v21 >= v8 )
+    if ( v18 ^ (v21 >= v8) )
     {
       v22 = dword_4F5D98_xs[v20 + 1];
       if ( v22 >= a4a )
         v23 = 0;
       else
         v23 = 2;
-      v24 = v23 | dword_4F5D98_xs[v20] < a4a;
+      v24 = v23 | (dword_4F5D98_xs[v20] < a4a);
       if ( v24 != 3 )
       {
         if ( !v24
@@ -7975,14 +7975,14 @@
       break;
     v17 = v25;
     v18 = dword_4F5B24_ys[v25 + 2];
-    if ( v16 ^ v18 >= a3 )
+    if ( v16 ^ (v18 >= a3) )
     {
       v19 = dword_4F5BF4_xs[v17 + 2];
       if ( v19 >= a4a )
         v20 = 0;
       else
         v20 = 2;
-      v21 = v20 | dword_4F5BF4_xs[v17 + 1] < a4a;
+      v21 = v20 | (dword_4F5BF4_xs[v17 + 1] < a4a);
       if ( v21 != 3 )
       {
         if ( !v21