Changeset 121 for libcaca/trunk/libee/sprite.cTweet

Timestamp:

Nov 10, 2003, 10:26:40 AM (19 years ago)

Author:

Sam Hocevar

Message:

• libee/sprite.c: + More robust sprite loader. + Added ee_set_sprite_frame() and ee_get_sprite_frame(). + Free all structures in ee_free_sprite().
• src/aliens.c src/bonus.c: + Use ee_draw_sprite() instead of our manual sprite rendering.
• src/box.c: + Use ee_draw_line() instead of the manual equivalent.
• data/: + Added foo_fighter, baz_fighter, item_gem and item_heart sprites.

File:

• libcaca/trunk/libee/sprite.c (modified) (5 diffs)

libcaca/trunk/libee/sprite.c

@@ -25 +25 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "ee.h"
@@ -88 +89 @@
         for(y = 0; y < h; y++)
         {
+            memset(buf, ' ', w);
+            buf[w] = '\0';
             if(!fgets(buf, BUFSIZ, fd))
                 goto failed;
@@ -97 +100 @@
         for(y = 0; y < h; y++)
         {
+            memset(buf, ' ', w);
+            buf[w] = '\0';
             if(!fgets(buf, BUFSIZ, fd))
                 goto failed;
@@ -124 +129 @@
 }
 
+void ee_set_sprite_frame(struct ee_sprite *sprite, int f)
+{
+    if(f < 0 || f >= sprite->nf)
+        return;
+
+    sprite->f = f;
+}
+
+int ee_get_sprite_frame(struct ee_sprite *sprite)
+{
+    return sprite->f;
+}
+
 void ee_draw_sprite(int x, int y, struct ee_sprite *sprite)
 {
@@ -146 +164 @@
 void ee_free_sprite(struct ee_sprite *sprite)
 {
+    int i;
+
+    for(i = sprite->nf; i--;)
+    {
+        struct ee_frame *frame = &sprite->frames[i];
+        free(frame->chars);
+        free(frame->color);
+    }
+
+    free(sprite->frames);
     free(sprite);
 }