Changeset 139Tweet

Timestamp:

Nov 10, 2003, 10:17:47 PM (20 years ago)

Author:

Sam Hocevar

Message:

• libee/sprite.c: + Made sprite loading more robust.
• src/explosions.c: + No longer use ee_putchar etc. to draw our sprites, but use

ee_draw_sprite().

• data/: + Drew explosion_medium and explosion_small sprites.

Location:

libcaca/trunk

Files:

• data/Makefile.am (modified) (1 diff)
• data/explosion_medium (added)
• data/explosion_small (added)
• libee/sprite.c (modified) (1 diff)
• src/explosions.c (modified) (3 diffs)

libcaca/trunk/data/Makefile.am

@@ -1 @@
-EXTRA_DIST = foo_fighter bar_fighter bar_boss baz_fighter item_gem item_heart
+EXTRA_DIST = \
+        foo_fighter \
+        bar_fighter \
+        bar_boss \
+        baz_fighter \
+        explosion_medium \
+        explosion_small \
+        item_gem \
+        item_heart \
+        $(NULL)

libcaca/trunk/libee/sprite.c

@@ -89 +89 @@
         for(y = 0; y < h; y++)
         {
-            memset(buf, ' ', w);
-            buf[w] = '\0';
             if(!fgets(buf, BUFSIZ, fd))
                 goto failed;
 
-            for(x = 0; x < w; x++)
+            for(x = 0; x < w && buf[x] && buf[x] != '\r' && buf[x] != '\n'; x++)
                 frame->chars[w * y + x] = buf[x];
+
+            for(; x < w; x++)
+                frame->chars[w * y + x] = ' ';
         }
 
         for(y = 0; y < h; y++)
         {
-            memset(buf, ' ', w);
-            buf[w] = '\0';
             if(!fgets(buf, BUFSIZ, fd))
                 goto failed;
 
-            for(x = 0; x < w; x++)
+            for(x = 0; x < w && buf[x] && buf[x] != '\r' && buf[x] != '\n'; x++)
                 frame->color[w * y + x] = buf[x] - 'a';
+
+            for(; x < w; x++)
+                frame->color[w * y + x] = ' ' - 'a';
         }
 

libcaca/trunk/src/explosions.c

@@ -30 +30 @@
 static void draw_medium_explosion(int x, int y, int frame);
 
+struct ee_sprite *medium_sprite;
+struct ee_sprite *small_sprite;
+
 void init_explosions(game *g, explosions *ex)
 {
@@ -38 +41 @@
         ex->type[i] = EXPLOSION_NONE;
     }
+
+    medium_sprite = ee_load_sprite("data/explosion_medium");
+    small_sprite = ee_load_sprite("data/explosion_small");
 }
 
@@ -138 +144 @@
 static void draw_small_explosion(int x, int y, int frame)
 {
-    switch(frame)
-    {
-    case 6:
-        ee_color(EE_YELLOW);
-        ee_goto(x, y);
-        ee_putchar('+');
-        break;
-    case 5:
-        ee_color(EE_YELLOW);
-        ee_goto(x, y);
-        ee_putchar('o');
-        break;
-    case 4:
-        ee_color(EE_YELLOW);
-        ee_goto(x, y-1);
-        ee_putchar('_');
-        ee_goto(x-1, y);
-        ee_putstr(")_(");
-        break;
-    case 3:
-        ee_color(EE_YELLOW);
-        ee_goto(x-1, y-1);
-        ee_putstr("._,");
-        ee_goto(x-1, y);
-        ee_putstr(")_(");
-        ee_goto(x-1, y+1);
-        ee_putstr("\' `");
-        break;
-    case 2:
-        ee_color(EE_YELLOW);
-        ee_goto(x-1, y-1);
-        ee_putstr(".v,");
-        ee_goto(x-1, y);
-        ee_putstr("> <");
-        ee_goto(x-1, y+1);
-        ee_putstr("\'^`");
-        break;
-    case 1:
-        ee_color(EE_WHITE);
-        ee_goto(x-1, y-1);
-        ee_putstr(". ,");
-        ee_goto(x-1, y);
-        ee_putstr("   ");
-        ee_goto(x-1, y+1);
-        ee_putstr("\' `");
-        break;
-    }
+    ee_set_sprite_frame(small_sprite, 6 - frame);
+    ee_draw_sprite(x, y, small_sprite);
 }
 
 static void draw_medium_explosion(int x, int y, int frame)
 {
-    ee_color(EE_YELLOW);
-
-    switch(frame)
-    {
-    case 10:
-        ee_goto(x, y);
-        ee_putchar('+');
-        break;
-    case 9:
-        ee_goto(x, y);
-        ee_putchar('o');
-        break;
-    case 8:
-        ee_goto(x, y-1);
-        ee_putchar('_');
-        ee_goto(x-1, y);
-        ee_putstr(")_(");
-        break;
-    case 7:
-        ee_goto(x-1, y-1);
-        ee_putstr("._,");
-        ee_goto(x-1, y);
-        ee_putstr(")_(");
-        ee_goto(x-1, y+1);
-        ee_putstr("\' `");
-        break;
-    case 6:
-        ee_goto(x-1, y-1);
-        ee_putstr(".v,");
-        ee_goto(x-1, y);
-        ee_putstr("> <");
-        ee_goto(x-1, y+1);
-        ee_putstr("\'^`");
-        break;
-    case 5:
-        ee_color(EE_RED);
-    case 4:
-        ee_goto(x-2, y-1);
-        ee_putstr("_\\~/_");
-        ee_goto(x-2, y);
-        ee_putstr(">   <");
-        ee_goto(x-2, y+1);
-        ee_putstr("~/_\\~");
-        break;
-    case 3:
-        ee_color(EE_RED);
-    case 2:
-        ee_goto(x-2, y-1);
-        ee_putstr("_\\ /_");
-        ee_goto(x-2, y);
-        ee_putstr("_   _");
-        ee_goto(x-2, y+1);
-        ee_putstr(" / \\ ");
-        break;
-    case 1:
-        ee_color(EE_WHITE);
-        ee_goto(x-2, y-1);
-        ee_putstr(". \' ,");
-        ee_goto(x-2, y);
-        ee_putstr("     ");
-        ee_goto(x-2, y+1);
-        ee_putstr("\' . `");
-        break;
-    }
+    ee_set_sprite_frame(medium_sprite, 10 - frame);
+    ee_draw_sprite(x, y, medium_sprite);
 }