Mercurial > mm7

diff UIHouses.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 29a8defbad9e
line wrap: on
line diff
--- a/UIHouses.cpp	Mon May 27 22:25:27 2013 +0200
+++ b/UIHouses.cpp	Mon May 27 23:05:32 2013 +0200
@@ -2471,7 +2471,7 @@
       pNumActiveItem = pDialogueWindow->pStartingPosActiveItem;
       v36 = LOBYTE(pFontArrus->uFontHeight) - 3;
       v37 = -pDialogueWindow->pNumPresenceButton < 0;
-      if ( !(v37 ^ pNumActiveItem < pNumActiveItem + pDialogueWindow->pNumPresenceButton) )
+      if ( !(v37 ^ (pNumActiveItem < pNumActiveItem + pDialogueWindow->pNumPresenceButton)) )
       {
         do
         {
@@ -2883,7 +2883,7 @@
         pNumActiveItem = pDialogueWindow->pStartingPosActiveItem;
         v19 = (174 - 4 * (174 - all_text_height) / 4 - all_text_height) / 2 - (174 - all_text_height) / 4 / 2 + 138;
         v20 = -pDialogueWindow->pNumPresenceButton < 0;
-        if ( v20 ^ pNumActiveItem > pNumActiveItem + pDialogueWindow->pNumPresenceButton )
+        if ( v20 ^ (pNumActiveItem > pNumActiveItem + pDialogueWindow->pNumPresenceButton ))
         {
           pItemNum = 2;
           pNumString = 0;
@@ -3079,7 +3079,7 @@
       pNumActiveItem = pDialogueWindow->pStartingPosActiveItem;
       v70 = (3 * (58 - (signed int)v103) - all_text_height) / 2 - ((174 - all_text_height) / 3) / 2 + 138;
       v20 = -pDialogueWindow->pNumPresenceButton < 0;
-      if ( v20 ^ pNumActiveItem > pNumActiveItem + pDialogueWindow->pNumPresenceButton )
+      if ( v20 ^ (pNumActiveItem > pNumActiveItem + pDialogueWindow->pNumPresenceButton ))
       {
         pItemNum = 2;
         pNumString = 0;
@@ -3413,7 +3413,7 @@
         v76 = pNumActiveItem + pDialogueWindow->pNumPresenceButton;
         v77 = (174 - 4 * (174 - all_text_height) / 4 - all_text_height) / 2 - (174 - all_text_height) / 4 / 2 + 138;
         v28 = -pDialogueWindow->pNumPresenceButton < 0;
-        if ( v28 ^ pNumActiveItem > v76 )
+        if ( v28 ^ (pNumActiveItem > v76) )
         {
           pItemNum = 2;
           pNumString = 0;
@@ -3613,7 +3613,7 @@
       v26 = pNumActiveItem + pDialogueWindow->pNumPresenceButton;
       v27 = (2 * (87 - (174 - all_text_height) / 2) - all_text_height) / 2 - (174 - all_text_height) / 2 / 2 + 138;
       v28 = -pDialogueWindow->pNumPresenceButton < 0;
-      if ( v28 ^ pNumActiveItem > v26 )
+      if ( v28 ^ (pNumActiveItem > v26) )
       {
         pItemNum = 2;
         pNumString = 0;
@@ -4167,7 +4167,7 @@
       v86 = (3 * (58 - v152) - all_text_height) / 2 - v152 / 2 + 138;
       v24 = -pDialogueWindow->pNumPresenceButton < 0;
       pActiveButton = pDialogueWindow->pStartingPosActiveItem;
-      if ( v24 ^ pDialogueWindow->pStartingPosActiveItem > pDialogueWindow->pStartingPosActiveItem + pDialogueWindow->pNumPresenceButton )
+      if ( v24 ^ (pDialogueWindow->pStartingPosActiveItem > pDialogueWindow->pStartingPosActiveItem + pDialogueWindow->pNumPresenceButton) )
       {
         pNumString = 0;
         do
@@ -5897,7 +5897,7 @@
     v81 = (3 * (58 - (signed int)_this) - all_text_height) / 2 - (174 - all_text_height) / 3 / 2 + 138;
     v20 = -pDialogueWindow->pNumPresenceButton < 0;
     v118 = pDialogueWindow->pStartingPosActiveItem;
-    if ( v20 ^ pDialogueWindow->pStartingPosActiveItem > pDialogueWindow->pStartingPosActiveItem + pDialogueWindow->pNumPresenceButton )
+    if ( v20 ^ (pDialogueWindow->pStartingPosActiveItem > pDialogueWindow->pStartingPosActiveItem + pDialogueWindow->pNumPresenceButton) )
     {
       v122 = 2;
       pSrtingNum = 0;