corrected two comments and reduced indentation levels

pygame-community · May 27, 2024 · 73a0427 · 73a0427
1 parent f072a37
commit 73a0427
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 46 deletions.
diff --git a/src_c/circle.c b/src_c/circle.c
@@ -613,13 +613,13 @@ pg_circle_collidelist(pgCircleObject *self, PyObject *arg)
     if (PySequence_FAST_CHECK(arg)) {
         PyObject **items = PySequence_Fast_ITEMS(arg);
         for (i = 0; i < PySequence_Fast_GET_SIZE(arg); i++) {
-            colliding = _pg_circle_collideswith(scirc, items[i]);
-            if (colliding == 1) {
-                return PyLong_FromSsize_t(i);
-            }
-            else if (colliding == -1) {
+            if ((colliding = _pg_circle_collideswith(scirc, items[i])) == -1) {
+                /*invalid shape*/
                 return NULL;
             }
+            if (colliding) {
+                return PyLong_FromSsize_t(i);
+            }
         }
         return PyLong_FromLong(-1);
     }
@@ -631,15 +631,16 @@ pg_circle_collidelist(pgCircleObject *self, PyObject *arg)
             return NULL;
         }
 
-        colliding = _pg_circle_collideswith(scirc, obj);
+        if ((colliding = _pg_circle_collideswith(scirc, obj)) == -1) {
+            /*invalid shape*/
+            Py_DECREF(obj);
+            return NULL;
+        }
         Py_DECREF(obj);
 
-        if (colliding == 1) {
+        if (colliding) {
             return PyLong_FromSsize_t(i);
         }
-        else if (colliding == -1) {
-            return NULL;
-        }
     }
 
     return PyLong_FromLong(-1);
@@ -667,27 +668,28 @@ pg_circle_collidelistall(pgCircleObject *self, PyObject *arg)
         PyObject **items = PySequence_Fast_ITEMS(arg);
 
         for (i = 0; i < PySequence_Fast_GET_SIZE(arg); i++) {
-            colliding = _pg_circle_collideswith(scirc, items[i]);
-
-            if (colliding == 1) {
-                PyObject *num = PyLong_FromSsize_t(i);
-                if (!num) {
-                    Py_DECREF(ret);
-                    return NULL;
-                }
-
-                if (PyList_Append(ret, num)) {
-                    Py_DECREF(num);
-                    Py_DECREF(ret);
-                    return NULL;
-                }
-                Py_DECREF(num);
+            if ((colliding = _pg_circle_collideswith(scirc, items[i])) == -1) {
+                /*invalid shape*/
+                Py_DECREF(ret);
+                return NULL;
             }
-            /*invalid shape*/
-            else if (colliding == -1) {
+
+            if (!colliding) {
+                continue;
+            }
+
+            PyObject *num = PyLong_FromSsize_t(i);
+            if (!num) {
                 Py_DECREF(ret);
                 return NULL;
             }
+
+            if (PyList_Append(ret, num)) {
+                Py_DECREF(num);
+                Py_DECREF(ret);
+                return NULL;
+            }
+            Py_DECREF(num);
         }
 
         return ret;
@@ -701,28 +703,30 @@ pg_circle_collidelistall(pgCircleObject *self, PyObject *arg)
             return NULL;
         }
 
-        colliding = _pg_circle_collideswith(scirc, obj);
+        if ((colliding = _pg_circle_collideswith(scirc, obj)) == -1) {
+            /*invalid shape*/
+            Py_DECREF(ret);
+            Py_DECREF(obj);
+            return NULL;
+        }
         Py_DECREF(obj);
 
-        if (colliding == 1) {
-            PyObject *num = PyLong_FromSsize_t(i);
-            if (!num) {
-                Py_DECREF(ret);
-                return NULL;
-            }
+        if (!colliding) {
+            continue;
+        }
 
-            if (PyList_Append(ret, num)) {
-                Py_DECREF(num);
-                Py_DECREF(ret);
-                return NULL;
-            }
-            Py_DECREF(num);
+        PyObject *num = PyLong_FromSsize_t(i);
+        if (!num) {
+            Py_DECREF(ret);
+            return NULL;
         }
-        /*invalid shape*/
-        else if (colliding == -1) {
+
+        if (PyList_Append(ret, num)) {
+            Py_DECREF(num);
             Py_DECREF(ret);
             return NULL;
         }
+        Py_DECREF(num);
     }
 
     return ret;

diff --git a/test/test_circle.py b/test/test_circle.py
@@ -1412,8 +1412,7 @@ def test_collidelist_return_type(self):
             self.assertIsInstance(c.collidelist([object]), int)
 
     def test_collidelist(self):
-        """Ensures that the collidelist method correctly determines if a circle is
-        contained within the circle"""
+        """Ensures that the collidelist method works correctly"""
         c = Circle(10, 10, 4)
 
         circles = [Circle(1000, 1000, 2), Circle(5, 10, 5), Circle(16, 10, 7)]
@@ -1467,8 +1466,7 @@ def test_collidelistall_return_type(self):
             self.assertIsInstance(c.collidelistall([object]), list)
 
     def test_collidelistall(self):
-        """Ensures that the collidelistall method correctly determines if a circle is
-        contained within the circle"""
+        """Ensures that the collidelistall method works correctly"""
         c = Circle(10, 10, 4)
 
         circles = [Circle(1000, 1000, 2), Circle(5, 10, 5), Circle(16, 10, 7)]