Changeset 986 for trunk

Timestamp:

Oct 5, 2006, 9:34:22 PM (16 years ago)

Author:

livings124

Message:

Combine multiple loops into 1

File:

• trunk/macosx/Torrent.m (modified) (4 diffs)

trunk/macosx/Torrent.m

@@ -852 +852 @@
     int8_t * pieces = malloc(MAX_PIECES);
     [self getAvailability: pieces size: MAX_PIECES];
-    int avail = 0;
-    for (w = 0; w < MAX_PIECES; w++)
-        if (pieces[w] != 0)
-            avail++;
-
-    //first two lines: dark blue to show progression, green to show available
-    int end = [self progress] * MAX_PIECES;
-    p = (uint32_t *) bitmapData;
-
-    for (w = 0; w < end; w++)
-    {
-        p[w] = kBlue4;
-        p[w + bytesPerRow / 4] = kBlue4;
-    }
-    for (; w < avail; w++)
-    {
-        p[w] = kGreen;
-        p[w + bytesPerRow / 4] = kGreen;
-    }
-    for (; w < MAX_PIECES; w++)
-    {
-        p[w] = kWhite;
-        p[w + bytesPerRow / 4] = kWhite;
-    }
     
     //lines 2 to 14: blue or grey depending on whether we have the piece or not
+    int have = 0, avail = 0;
     uint32_t color;
     BOOL change;
@@ -891 +868 @@
                 change = YES;
             }
+            have++;
         }
         else if (pieces[w] == 0)
@@ -901 +879 @@
             }
         }
-        else if (pieces[w] == 1)
-        {
-            if (fPieces[w] != 1)
-            {
-                color = kBlue1;
-                fPieces[w] = 1;
-                change = YES;
-            }
-        }
-        else if (pieces[w] == 2)
-        {
-            if (fPieces[w] != 2)
-            {
-                color = kBlue2;
-                fPieces[w] = 2;
-                change = YES;
-            }
-        }
         else
         {
-            if (fPieces[w] != 3)
+            if (pieces[w] == 1)
             {
-                color = kBlue3;
-                fPieces[w] = 3;
-                change = YES;
+                if (fPieces[w] != 1)
+                {
+                    color = kBlue1;
+                    fPieces[w] = 1;
+                    change = YES;
+                }
             }
+            else if (pieces[w] == 2)
+            {
+                if (fPieces[w] != 2)
+                {
+                    color = kBlue2;
+                    fPieces[w] = 2;
+                    change = YES;
+                }
+            }
+            else
+            {
+                if (fPieces[w] != 3)
+                {
+                    color = kBlue3;
+                    fPieces[w] = 3;
+                    change = YES;
+                }
+            }
+            avail++;
         }
         
@@ -940 +922 @@
         }
     }
-
+    
+    //first two lines: dark blue to show progression, green to show available
+    p = (uint32_t *) bitmapData;
+    for (w = 0; w < have; w++)
+    {
+        p[w] = kBlue4;
+        p[w + bytesPerRow / 4] = kBlue4;
+    }
+    for (; w < avail + have; w++)
+    {
+        p[w] = kGreen;
+        p[w + bytesPerRow / 4] = kGreen;
+    }
+    for (; w < MAX_PIECES; w++)
+    {
+        p[w] = kWhite;
+        p[w + bytesPerRow / 4] = kWhite;
+    }
+    
     free(pieces);