Changeset 136Tweet

Timestamp:

Nov 10, 2003, 7:29:04 PM (16 years ago)

Author:

Sam Hocevar

Message:

• libee/sprite.c: + Added sanity checks in ee_sprite_* functions.
• libee/conic.c: + Use ellipsepoints() in ee_draw_circle().

Location:

ttyvaders/trunk/libee

Files:

• conic.c (modified) (3 diffs)
• sprite.c (modified) (4 diffs)

ttyvaders/trunk/libee/conic.c

@@ -27 +27 @@
 #include "ee.h"
 
+static void ellipsepoints(int, int, int, int, char);
+
 void ee_draw_circle(int x, int y, int r, char c)
 {
@@ -34 +36 @@
     for(test = 0, dx = 0, dy = r ; dx <= dy ; dx++)
     {
-        ee_putcharTO(x + dx, y + dy / 2, c);
-        ee_putcharTO(x - dx, y + dy / 2, c);
-        ee_putcharTO(x + dx, y - dy / 2, c);
-        ee_putcharTO(x - dx, y - dy / 2, c);
-
-        ee_putcharTO(x + dy, y + dx / 2, c);
-        ee_putcharTO(x - dy, y + dx / 2, c);
-        ee_putcharTO(x + dy, y - dx / 2, c);
-        ee_putcharTO(x - dy, y - dx / 2, c);
+        ellipsepoints(x, y, dx, dy, c);
+        ellipsepoints(x, y, dy, dx, c);
 
         test += test > 0 ? dx - dy-- : dx;
     }
-}
-
-static void ellipsepoints(int xo, int yo, int x, int y, char c)
-{
-    ee_putcharTO(xo + x, yo + y, c);
-    ee_putcharTO(xo - x, yo + y, c);
-    ee_putcharTO(xo + x, yo - y, c);
-    ee_putcharTO(xo - x, yo - y, c);
 }
 
@@ -98 +85 @@
 }
 
+static void ellipsepoints(int xo, int yo, int x, int y, char c)
+{
+    ee_putcharTO(xo + x, yo + y, c);
+    ee_putcharTO(xo - x, yo + y, c);
+    ee_putcharTO(xo + x, yo - y, c);
+    ee_putcharTO(xo - x, yo - y, c);
+}
+

ttyvaders/trunk/libee/sprite.c

@@ -131 +131 @@
 void ee_set_sprite_frame(struct ee_sprite *sprite, int f)
 {
+    if(sprite == NULL)
+        return;
+
     if(f < 0 || f >= sprite->nf)
         return;
@@ -139 +142 @@
 int ee_get_sprite_frame(struct ee_sprite *sprite)
 {
+    if(sprite == NULL)
+        return -1;
+
     return sprite->f;
 }
@@ -145 +151 @@
 {
     int i, j;
-    struct ee_frame *frame = &sprite->frames[sprite->f];
+    struct ee_frame *frame;
+
+    if(sprite == NULL)
+        return;
+
+    frame = &sprite->frames[sprite->f];
 
     for(j = 0; j < frame->h; j++)
@@ -166 +177 @@
     int i;
 
+    if(sprite == NULL)
+        return;
+
     for(i = sprite->nf; i--;)
     {