Changeset 142 for ttyvadersTweet

Timestamp:

Nov 10, 2003, 10:54:11 PM (19 years ago)

Author:

Sam Hocevar

Message:

• data/weapon_bomb: + New bomb sprite.
• src/weapons.c: + Switched the bomb drawing to use ee_draw_sprite().

Location:

ttyvaders/trunk

Files:

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

ttyvaders/trunk/data/Makefile.am

@@ -8 +8 @@
         item_gem \
         item_heart \
+        weapon_bomb \
         $(NULL)

ttyvaders/trunk/src/weapons.c

@@ -32 +32 @@
 static void draw_fragbomb(int x, int y, int frame);
 
+struct ee_sprite *bomb_sprite;
+
 void init_weapons(game *g, weapons *wp)
 {
@@ -40 +42 @@
         wp->type[i] = WEAPON_NONE;
     }
+
+    bomb_sprite = ee_load_sprite("data/weapon_bomb");
 }
 
@@ -290 +294 @@
 static void draw_bomb(int x, int y, int vx, int vy)
 {
+    int frame;
+
+    /* We have 1x2 pixels */
     vy *= 2;
-    ee_color(EE_CYAN);
 
     if(vx > vy)
@@ -298 +304 @@
         {
             if(vy > vx/4)
-            {
-                /* -1pi/6 */
-                ee_goto(x-4, y-1);
-                ee_putstr("/`-.");
-                ee_goto(x-4, y);
-                ee_putstr("`-._\\");
-                ee_color(EE_WHITE);
-                ee_goto(x-1, y);
-                ee_putstr("_\\");
-                ee_goto(x, y+1);
-                ee_putchar('`');
-            }
+                frame = 0; /* -pi/6 */
             else if(vy < -vx/4)
-            {
-                /* 1pi/6 */
-                ee_goto(x-4, y);
-                ee_putstr(",-' ");
-                ee_goto(x-4, y+1);
-                ee_putstr("\\,-'");
-                ee_color(EE_WHITE);
-                ee_goto(x-1, y-1);
-                ee_putstr("_,");
-                ee_goto(x, y);
-                ee_putchar('/');
-            }
+                frame = 1; /* pi/6 */
             else
-            {
-                /* 0pi/6 */
-                ee_goto(x-4, y-1);
-                ee_putstr("____");
-                ee_goto(x-5, y);
-                ee_putstr("|____");
-                ee_color(EE_WHITE);
-                ee_goto(x, y);
-                ee_putchar('>');
-            }
+                frame = 2; /* 0pi/6 */
         }
         else /* top quarter */
         {
             if(vx > -vy/4)
-            {
-                /* 2pi/6 */
-                ee_goto(x-2, y);
-                ee_putstr("/ ");
-                ee_goto(x-3, y+1);
-                ee_putstr("/ /");
-                ee_goto(x-3, y+2);
-                ee_putstr("`'");
-                ee_color(EE_WHITE);
-                ee_goto(x-1, y-1);
-                ee_putstr("_,");
-                ee_goto(x, y);
-                ee_putchar('|');
-            }
+                frame = 3; /* 2pi/6 */
             else if(vx < vy/4)
-            {
-                /* 4pi/6 */
-                ee_goto(x+1, y);
-                ee_putstr(" \\");
-                ee_goto(x+1, y+1);
-                ee_putstr("\\ \\");
-                ee_goto(x+2, y+2);
-                ee_putstr("`'");
-                ee_color(EE_WHITE);
-                ee_goto(x, y-1);
-                ee_putstr("._");
-                ee_goto(x, y);
-                ee_putchar('|');
-            }
+                frame = 4; /* 4pi/6 */
             else
-            {
-                /* 3pi/6 */
-                ee_goto(x-1, y+1);
-                ee_putstr("| |");
-                ee_goto(x-1, y+2);
-                ee_putstr("|_|");
-                ee_color(EE_WHITE);
-                ee_goto(x-1, y);
-                ee_putstr(",^.");
-            }
+                frame = 5; /* 3pi/6 */
         }
     }
@@ -385 +325 @@
         {
             if(vx > vy/4)
-            {
-                /* -2pi/6 */
-                ee_goto(x-2, y-2);
-                ee_putstr(",.");
-                ee_goto(x-2, y-1);
-                ee_putstr("\\ \\");
-                ee_goto(x-1, y);
-                ee_putchar('\\');
-                ee_color(EE_WHITE);
-                ee_goto(x, y);
-                ee_putstr("_|");
-            }
+                frame = 6; /* -2pi/6 */
             else if(vx < -vy/4)
-            {
-                /* -4pi/6 */
-                ee_goto(x+1, y-2);
-                ee_putstr(",.");
-                ee_goto(x, y-1);
-                ee_putstr("/ /");
-                ee_goto(x+1, y);
-                ee_putchar('/');
-                ee_color(EE_WHITE);
-                ee_goto(x-1, y);
-                ee_putstr("|_/");
-            }
+                frame = 7; /* -4pi/6 */
             else
-            {
-                /* -3pi/6 */
-                ee_goto(x, y-3);
-                ee_putchar('_');
-                ee_goto(x-1, y-2);
-                ee_putstr("| |");
-                ee_goto(x-1, y-1);
-                ee_putstr("| |");
-                ee_color(EE_WHITE);
-                ee_goto(x-1, y);
-                ee_putstr("`v'");
-            }
+                frame = 8; /* -3pi/6 */
         }
         else /* left quarter */
         {
             if(vy > -vx/4)
-            {
-                /* -5pi/6 */
-                ee_goto(x+1, y-1);
-                ee_putstr(",-'\\");
-                ee_goto(x+2, y);
-                ee_putstr(",-'");
-                ee_goto(x, y+1);
-                ee_putchar('\'');
-                ee_color(EE_WHITE);
-                ee_goto(x, y);
-                ee_putstr("/_");
-            }
+                frame = 9; /* -5pi/6 */
             else if(vy < vx/4)
-            {
-                /* 5pi/6 */
-                ee_goto(x+1, y);
-                ee_putstr(" `-.");
-                ee_goto(x+1, y+1);
-                ee_putstr("`-./");
-                ee_color(EE_WHITE);
-                ee_goto(x, y-1);
-                ee_putstr("._");
-                ee_goto(x, y);
-                ee_putchar('\\');
-            }
+                frame = 10; /* 5pi/6 */
             else
-            {
-                /* 6pi/6 */
-                ee_goto(x+1, y-1);
-                ee_putstr("____");
-                ee_goto(x+1, y);
-                ee_putstr("____|");
-                ee_color(EE_WHITE);
-                ee_goto(x, y);
-                ee_putchar('<');
-            }
-        }
-    }
+                frame = 11; /* 6pi/6 */
+        }
+    }
+
+    ee_set_sprite_frame(bomb_sprite, frame);
+    ee_draw_sprite(x, y, bomb_sprite);
 }