Changeset 143Tweet

Timestamp:

Nov 10, 2003, 11:43:30 PM (20 years ago)

Author:

Sam Hocevar

Message:

• src/weapons.c data/weapon_fragbomb: + Drew the fragbomb sprite. + Use the fragbomb in src/weapons.c.

Location:

libcaca/trunk

Files:

• data/Makefile.am (modified) (1 diff)
• data/weapon_fragbomb (added)
• src/weapons.c (modified) (3 diffs)

libcaca/trunk/data/Makefile.am

@@ -9 +9 @@
         item_heart \
         weapon_bomb \
+        weapon_fragbomb \
         $(NULL)

libcaca/trunk/src/weapons.c

@@ -33 +33 @@
 
 struct ee_sprite *bomb_sprite;
+struct ee_sprite *fragbomb_sprite;
 
 void init_weapons(game *g, weapons *wp)
@@ -44 +45 @@
 
     bomb_sprite = ee_load_sprite("data/weapon_bomb");
+    fragbomb_sprite = ee_load_sprite("data/weapon_fragbomb");
 }
 
@@ -348 +350 @@
 static void draw_fragbomb(int x, int y, int frame)
 {
-    ee_color(EE_WHITE);
-
-    ee_color(frame & 1 ? EE_CYAN : EE_WHITE);
-    ee_goto(x-2, y);
-    ee_putstr("(    )");
-    ee_goto(x-1, y+1);
-    ee_putstr("`--'");
-
-    ee_color(frame & 1 ? EE_WHITE : EE_CYAN);
-    ee_goto(x-1, y-1);
-    ee_putstr(",--.");
-    ee_goto(x, y);
-    ee_putstr("',");
-
-    switch(frame % 4)
-    {
-    case 0:
-        ee_color(EE_CYAN);
-        ee_goto(x, y + 2);
-        ee_putchar('O');
-        ee_goto(x + 2, y + 2);
-        ee_putchar('o');
-        ee_goto(x + 1, y + 3);
-        ee_putchar('o');
-        ee_color(EE_GRAY);
-        ee_goto(x - 1, y + 3);
-        ee_putchar(':');
-        ee_goto(x + 2, y + 4);
-        ee_putchar(':');
-        ee_goto(x, y + 4);
-        ee_putchar('.');
-        ee_goto(x + 1, y + 5);
-        ee_putchar('.');
-        break;
-    case 1:
-        ee_color(EE_CYAN);
-        //ee_goto(x, y + 1);
-        //ee_putchar('O');
-        ee_goto(x + 1, y + 2);
-        ee_putchar('O');
-        ee_goto(x, y + 3);
-        ee_putchar('o');
-        ee_color(EE_GRAY);
-        ee_goto(x + 2, y + 3);
-        ee_putchar(':');
-        ee_goto(x + 1, y + 4);
-        ee_putchar(':');
-        ee_goto(x - 1, y + 4);
-        ee_putchar('.');
-        ee_goto(x + 2, y + 5);
-        ee_putchar('.');
-        break;
-    case 2:
-        ee_color(EE_CYAN);
-        //ee_goto(x - 1, y + 1);
-        //ee_putchar('O');
-        ee_goto(x + 2, y + 2);
-        ee_putchar('O');
-        ee_goto(x, y + 2);
-        ee_putchar('o');
-        ee_goto(x + 1, y + 3);
-        ee_putchar('o');
-        ee_color(EE_GRAY);
-        ee_goto(x, y + 4);
-        ee_putchar(':');
-        ee_goto(x + 2, y + 4);
-        ee_putchar('.');
-        ee_goto(x + 1, y + 5);
-        ee_putchar('.');
-        break;
-    case 3:
-        ee_color(EE_CYAN);
-        //ee_goto(x + 2, y + 1);
-        //ee_putchar('O');
-        ee_goto(x + 1, y + 2);
-        ee_putchar('O');
-        ee_goto(x - 1, y + 2);
-        ee_putchar('o');
-        ee_goto(x + 2, y + 3);
-        ee_putchar('o');
-        ee_color(EE_GRAY);
-        ee_goto(x, y + 3);
-        ee_putchar(':');
-        ee_goto(x + 1, y + 4);
-        ee_putchar(':');
-        ee_goto(x, y + 5);
-        ee_putchar('.');
-        break;
-    }
+    /* Draw the head */
+    ee_set_sprite_frame(fragbomb_sprite, frame & 1);
+    ee_draw_sprite(x, y, fragbomb_sprite);
+
+    /* Draw the tail */
+    ee_set_sprite_frame(fragbomb_sprite, 2 + (frame % 4));
+    ee_draw_sprite(x, y, fragbomb_sprite);
 }