From 18551ced5f6c7f90c7ff805910d5e53721485444 Mon Sep 17 00:00:00 2001
From: Mathieu Schroeter <mathieu@schroetersa.ch>
Date: Fri, 22 Sep 2017 11:53:59 +0200
Subject: [PATCH] Invert logic for readability

---
 src/fix.cxx | 121 ++++++++++++++++++++++++++--------------------------
 1 file changed, 60 insertions(+), 61 deletions(-)

diff --git a/src/fix.cxx b/src/fix.cxx
index 44be6f1..3230941 100644
--- a/src/fix.cxx
+++ b/src/fix.cxx
@@ -628,78 +628,77 @@ CDecor::ArrangeObject (Point cel)
     }
   }
 
-  // Arrange les rayons entre les tours.
   if (
-    !g_restoreBugs ||
-    (g_restoreBugs &&
-     (m_decor[cel.x / 2][cel.y / 2].objectIcon == 27 || // tour ?
-      m_decor[cel.x / 2][cel.y / 2].objectIcon == -1)))
+    g_restoreBugs &&
+    (m_decor[cel.x / 2][cel.y / 2].objectIcon != 27 && // not a tower?
+     m_decor[cel.x / 2][cel.y / 2].objectIcon != -1))
+    return;
+
+  // Arrange les rayons entre les tours.
+  for (i = 0; i < 4; i++)
   {
-    for (i = 0; i < 4; i++)
+    vector = GetVector (i * 2 * 16);
+    test   = cel;
+
+    bTour = false;
+    j     = 0;
+    while (true)
     {
-      vector = GetVector (i * 2 * 16);
-      test   = cel;
+      test.x += vector.x * 2;
+      test.y += vector.y * 2;
 
+      if (m_decor[test.x / 2][test.y / 2].objectIcon == 27) // tour ?
+      {
+        bTour = true;
+        break;
+      }
+
+      if (
+        m_decor[test.x / 2][test.y / 2].objectIcon != -1 &&
+        m_decor[test.x / 2][test.y / 2].objectIcon != 10001 - i % 2)
+        break;
+
+      j++;
+      if (j >= 2 + 1)
+        break;
+    }
+
+    if (m_decor[cel.x / 2][cel.y / 2].objectIcon != 27) // pas tour ?
       bTour = false;
-      j     = 0;
-      while (true)
-      {
-        test.x += vector.x * 2;
-        test.y += vector.y * 2;
 
-        if (m_decor[test.x / 2][test.y / 2].objectIcon == 27) // tour ?
+    test = cel;
+    for (k = 0; k < j; k++)
+    {
+      test.x += vector.x * 2;
+      test.y += vector.y * 2;
+
+      if (bTour)
+      {
+        channel = CHOBJECT;
+        icon    = 10001 - i % 2; // rayon e-o (10001) ou n-s (10000)
+      }
+      else
+      {
+        channel = -1;
+        icon    = -1;
+      }
+      m_decor[test.x / 2][test.y / 2].objectChannel = channel;
+      m_decor[test.x / 2][test.y / 2].objectIcon    = icon;
+
+      if (!m_bBuild && bTour)
+      {
+        if (MoveCreate (
+              test, -1, false, CHOBJECT, -1, -1, -1, 9999, 1, 0, true))
         {
-          bTour = true;
-          break;
+          MoveAddIcons (test, 5 - i % 2, true); // éclairs
         }
 
-        if (
-          m_decor[test.x / 2][test.y / 2].objectIcon != -1 &&
-          m_decor[test.x / 2][test.y / 2].objectIcon != 10001 - i % 2)
-          break;
-
-        j++;
-        if (j >= 2 + 1)
-          break;
+        pos = ConvCelToPos (test);
+        m_pSound->PlayImage (SOUND_RAYON1, pos);
       }
 
-      if (m_decor[cel.x / 2][cel.y / 2].objectIcon != 27) // pas tour ?
-        bTour = false;
-
-      test = cel;
-      for (k = 0; k < j; k++)
-      {
-        test.x += vector.x * 2;
-        test.y += vector.y * 2;
-
-        if (bTour)
-        {
-          channel = CHOBJECT;
-          icon    = 10001 - i % 2; // rayon e-o (10001) ou n-s (10000)
-        }
-        else
-        {
-          channel = -1;
-          icon    = -1;
-        }
-        m_decor[test.x / 2][test.y / 2].objectChannel = channel;
-        m_decor[test.x / 2][test.y / 2].objectIcon    = icon;
-
-        if (!m_bBuild && bTour)
-        {
-          if (MoveCreate (
-                test, -1, false, CHOBJECT, -1, -1, -1, 9999, 1, 0, true))
-          {
-            MoveAddIcons (test, 5 - i % 2, true); // éclairs
-          }
-
-          pos = ConvCelToPos (test);
-          m_pSound->PlayImage (SOUND_RAYON1, pos);
-        }
-
-        if (!m_bBuild && !bTour)
-          MoveFinish (test);
-      }
+      if (!m_bBuild && !bTour)
+        MoveFinish (test);
     }
   }
 }