Changeset 161Tweet

Timestamp:

Nov 13, 2003, 12:46:58 AM (20 years ago)

Author:

Sam Hocevar

Message:

• test/demo.c: + Removed a spurious '\n' from an ee_putstr().
• src/starfield.c: + Fixed starfield color.
• data/: + Fixed every sprite's colors.

Location:

libcaca/trunk

Files:

• data/bar_boss (modified) (1 diff)
• data/bar_fighter (modified) (1 diff)
• data/baz_fighter (modified) (4 diffs)
• data/explosion_medium (modified) (1 diff)
• data/explosion_small (modified) (1 diff)
• data/foo_fighter (modified) (1 diff)
• data/item_gem (modified) (2 diffs)
• data/item_heart (modified) (2 diffs)
• data/ship_green (modified) (1 diff)
• data/weapon_bomb (modified) (4 diffs)
• data/weapon_fragbomb (modified) (5 diffs)
• src/starfield.c (modified) (2 diffs)
• test/demo.c (modified) (1 diff)

libcaca/trunk/data/bar_boss

@@ -13 +13 @@
    \o`---'  ,'        `.  `---'o/
     `.____,'            `.____,'
-               kkkkkk
-             kkkkkkkkkk
-     kk     kkhhhkkhhhkk     kk
-     khkkk kkhhehhhhehhkk kkkhk
-    khkkk kkkkhhhkkhhhkkkk kkkhk
-   kkk kk kkkkkhkkkkhkkkkk kk kkk
-   kkk khkkkkkkkhhhhkkkkkkkhk kkk
-   kkk  kkkkkkkkkkkkkkkkkkkk  kkk
-kk  kkkkkkkkkkkkkkkkkkkkk  kkkkk  kk
- kkk kkkkkk kkkkk  kkkkk kkkkkk kkk
-  khk     kkkkkk    kkkkkk     khk
-   khkkkkkkkkk        kkkkkkkkkhk
-    kkkkkkkk            kkkkkkkk
+               ffffff
+             ffffffffff
+     ff     ffhhhffhhhff     ff
+     fhfff ffhhphhhhphhff fffhf
+    fhfff ffffhhhffhhhffff fffhf
+   fff ff fffffhffffhfffff ff fff
+   fff fhfffffffhhhhfffffffhf fff
+   fff  ffffffffffffffffffff  fff
+ff  fffffffffffffffffffff  fffff  ff
+ fff ffffff fffff  fffff ffffff fff
+  fhf     ffffff    ffffff     fhf
+   fhfffffffff        fffffffffhf
+    ffffffff            ffffffff

libcaca/trunk/data/bar_fighter

@@ -3 +3 @@
 \O o/
 ^^^^^
-kkkkk
-keeek
-kkkkk
+fffff
+fpppf
+fffff
 5 3 2 1
 ,---.
 \o O/
 ^^^^^
-kkkkk
-keeek
-kkkkk
+fffff
+fpppf
+fffff

libcaca/trunk/data/baz_fighter

@@ -4 +4 @@
 //'`\\
   cc
- ceec
+ cppc
 cccccc
 6 3 2 1
@@ -11 +11 @@
 /(~~)\
   cc
- ceec
+ cppc
 cccccc
 6 3 2 1
@@ -18 +18 @@
 ((^^))
   cc
- ceec
+ cppc
 cccccc
 4 3 1 1
@@ -25 +25 @@
 \\//
  cc
-ceec
+cppc
 cccc

libcaca/trunk/data/explosion_medium

@@ -1 +1 @@
 1 1 0 0
 +
-d
+o
 1 1 0 0
 o
-d
+o
 3 2 1 1
  _
 )_(
- d
-ddd
+ o
+ooo
 3 3 1 1
 ._,
 )_(
 ' `
-ddd
-ddd
-ddd
+ooo
+ooo
+ooo
 3 3 1 1
 .v,
 > <
 '^`
-ddd
-ddd
-ddd
+ooo
+ooo
+ooo
 5 3 2 1
 _\~/_
 >   <
 ~/_\~
-fffff
-fffff
-fffff
+mmmmm
+mmmmm
+mmmmm
 5 3 2 1
 _\~/_
 >   <
 ~/_\~
-ddddd
-ddddd
-ddddd
+ooooo
+ooooo
+ooooo
 5 3 2 1
 _\ /_
      
 ~/ \~
-fffff
-fffff
-fffff
+mmmmm
+mmmmm
+mmmmm
 5 3 2 1
 _\ /_
 
 ~/ \~
-ddddd
-ddddd
-ddddd
+ooooo
+ooooo
+ooooo
 5 3 2 1
 . ' ,
 
 ' . `
-eeeee
-eeeee
-eeeee
+ppppp
+ppppp
+ppppp

libcaca/trunk/data/explosion_small

@@ -1 +1 @@
 1 1 0 0
 +
-d
+o
 1 1 0 0
 o
-d
+o
 3 2 1 1
  _
 )_(
- d
-ddd
+ o
+ooo
 3 3 1 1
 ._,
 )_(
 ' `
-ddd
-ddd
-ddd
+ooo
+ooo
+ooo
 3 3 1 1
 .v,
 > <
 '^`
-ddd
-ddd
-ddd
+ooo
+ooo
+ooo
 3 3 1 1
 . ,
 
 ' `
-ddd
-ddd
-ddd
+ooo
+ooo
+ooo

libcaca/trunk/data/foo_fighter

@@ -3 +3 @@
  \oXo/
   `V'
-d     d
- deded
-  ddd
+o     o
+ opopo
+  ooo
 9 3 4 1
 .       ,
  `-oXo-'
    `V'
-d       d
- ddededd
-   ddd
+o       o
+ oopopoo
+   ooo
 9 2 4 0
 `--oXo--'
    `V'
-dddededdd
-   ddd
+ooopopooo
+   ooo
 9 2 4 0
  ,-oXo-.
 '  `V'  `
- ddededd
-d  ddd  d
+ oopopoo
+o  ooo  o
 7 2 3 0
  ,oXo.
 / `V' \
- deded
-d ddd d
+ opopo
+o ooo o

libcaca/trunk/data/item_gem

@@ -4 +4 @@
 \_/
  c
-cec
+cpc
 ccc
 3 2 1 1
@@ -10 +10 @@
 /g\
 \_/
- e
-eee
-eee
+ p
+ppp
+ppp

libcaca/trunk/data/item_heart

@@ -1 @@
-5 3 2 1
- _ _
-( '^)
- `v'
- h h
-hhheh
- hhh
 5 3 2 1
  _ _
@@ -11 +4 @@
  `v'
  e e
-eeeee
+eeepe
  eee
+5 3 2 1
+ _ _
+( '^)
+ `v'
+ p p
+ppppp
+ ppp

libcaca/trunk/data/ship_green

@@ -4 +4 @@
 I<__>I
   cc
- cddc
+ cooc
 cccccc

libcaca/trunk/data/weapon_bomb

@@ -3 +3 @@
 `-._\
     `
-jjjj
-jjjee
-    e
+dddd
+dddpp
+    p
 5 3 3 1
    _,
 ,-' /
 \,-'
-   ee
-jjjje
-jjjj
+   pp
+ddddp
+dddd
 6 2 5 1
  ____
 |____>
- jjjj
-jjjjje
+ dddd
+dddddp
 4 4 2 1
   _,
@@ -23 +23 @@
 / /
 `'
-  ee
- jje
-jjj
-jj
+  pp
+ ddp
+ddd
+dd
 4 4 1 1
 ._
@@ -32 +32 @@
  \ \
   `'
-ee
-ejj
- jjj
-  jj
+pp
+pdd
+ ddd
+  dd
 3 3 1 0
 ,^.
 | |
 |_|
-eee
-jjj
-jjj
+ppp
+ddd
+ddd
 4 3 2 2
 ,.
 \ \
  \_|
-jj
-jjj
- jee
+dd
+ddd
+ dpp
 4 3 1 2
   ,.
  / /
 |_/
-  jj
- jjj
-eej
+  dd
+ ddd
+ppd
 3 4 1 3
  _
@@ -62 +62 @@
 | |
 `v'
- j
-jjj
-jjj
-eee
+ d
+ddd
+ddd
+ppp
 5 3 1 1
  ,-'\
 /_,-'
 '
- jjjj
-eejjj
-e
+ dddd
+ppddd
+p
 5 3 1 1
 ._
 \ `-.
  `-./
-ee
-ejjjj
- jjjj
+pp
+pdddd
+ dddd
 6 2 0 1
  ____
 <____|
- jjjj
-ejjjjj
+ dddd
+pddddd

libcaca/trunk/data/weapon_fragbomb

@@ -3 +3 @@
 ( ', )
  `--'
- jjjj
-eejjee
- eeee
+ dddd
+ppddpp
+ pppp
 6 3 2 1
  ,--.
 ( ', )
  `--'
- eeee
-jjeejj
- jjjj
+ pppp
+ddppdd
+ dddd
 4 4 1 -2
  O o
@@ -18 +18 @@
  . :
   .
- j j
-h j
- h h
-  h
+ d d
+i d
+ i i
+  i
 4 4 1 -2
   O
@@ -27 +27 @@
 . :
    .
-  j
- j h
-h h
-   h
+  d
+ d i
+i i
+   i
 4 4 1 -2
  o O
@@ -36 +36 @@
  : .
   .
- j j
-  j
- h h
-  h
+ d d
+  d
+ i i
+  i
 4 4 1 -2
 o O
@@ -45 +45 @@
   :
  .
-j j
- h j
-  h
- h
+d d
+ i d
+  i
+ i

libcaca/trunk/src/starfield.c

@@ -39 +39 @@
         s[i].y = ee_rand(0, g->h - 1);
         s[i].z = ee_rand(1, 3);
-        s[i].c = ee_rand(6, 7);
+        s[i].c = ee_rand(0, 1) ? EE_LIGHTGRAY : EE_DARKGRAY;
         s[i].ch = ee_rand(0, 1) ? '.' : '\'';
     }
@@ -71 +71 @@
             s[i].y = 0;
             s[i].z = ee_rand(1, 2);
-            s[i].c = ee_rand(6, 7);
+            s[i].c = ee_rand(0, 1) ? EE_LIGHTGRAY : EE_DARKGRAY;
             s[i].ch = ee_rand(0, 1) ? '.' : '\'';
         }

libcaca/trunk/test/demo.c

@@ -293 +293 @@
     for(i = 0; i < 16; i++)
     {
-        sprintf(buf, "color %i (%s)\n", i, ee_color_names[i]);
+        sprintf(buf, "'%c': %i (%s)", 'a' + i, i, ee_color_names[i]);
         ee_set_color(EE_WHITE);
         ee_putstr(4, i + 3, buf);