From 38886de0c3e9ea5729ef23e4c653fa2822f52e8f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 6 Apr 2021 14:43:39 +0200
Subject: xscreensaver 6.00

---
 hacks/glx/peepers.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'hacks/glx/peepers.c')

diff --git a/hacks/glx/peepers.c b/hacks/glx/peepers.c
index 3dc8fc1..1554616 100644
--- a/hacks/glx/peepers.c
+++ b/hacks/glx/peepers.c
@@ -27,9 +27,6 @@
 #define DEF_SPEED "1.0"
 #define DEF_MODE  "random"
 
-#undef countof
-#define countof(x) (sizeof((x))/sizeof((*x)))
-
 #undef BELLRAND
 #define BELLRAND(n) ((frand((n)) + frand((n)) + frand((n))) / 3)
 #undef RANDSIGN
@@ -233,10 +230,10 @@ reset_floater (ModeInfo *mi, floater *f)
       p += c[i].pct;
     p = frand(p);
 
-    for (i = 0; i < countof(c); i++)
+    for (i = 0; i < countof(c) - 1; i++)
       {
-        if (t > p) break;
         t += c[i].pct;
+        if (t > p) break;
       }
 
     if (c[i].c == 0xFFAA88)    f->jaundice = 2;
-- 
cgit v1.2.3-55-g7522