Changeset 1311 for cacatris/trunk/srcTweet

Timestamp:

Nov 9, 2006, 11:52:31 AM (16 years ago)

Author:

Sam Hocevar

Message:

• Update code to make use of libcaca 0.99.beta9.

Location:

cacatris/trunk/src

Files:

• cacatris.h (modified) (1 diff)
• main.c (modified) (2 diffs)

cacatris/trunk/src/cacatris.h

@@ -44 +44 @@
 
 unsigned int blocks_palette[] = {
-    CUCUL_COLOR_BLUE,
-    CUCUL_COLOR_GREEN,
-    CUCUL_COLOR_CYAN,
-    CUCUL_COLOR_RED,
-    CUCUL_COLOR_MAGENTA,
-    CUCUL_COLOR_BROWN,
-    CUCUL_COLOR_LIGHTGRAY
+    CUCUL_BLUE,
+    CUCUL_GREEN,
+    CUCUL_CYAN,
+    CUCUL_RED,
+    CUCUL_MAGENTA,
+    CUCUL_BROWN,
+    CUCUL_LIGHTGRAY
 };
 

cacatris/trunk/src/main.c

@@ -200 +200 @@
     sprintf(totalline, " Lines    :   %02d    ", total);
 
-    cucul_set_color(inf, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
+    cucul_set_color_ansi(inf, CUCUL_WHITE, CUCUL_BLUE);
     cucul_putstr(inf, 0, 0, "      =Cacatris=    ");
     cucul_putstr(inf, 0, 1, "  Arrows  :    move ");
@@ -232 +232 @@
             unsigned int oyi = (unsigned int) oy;
             unsigned int c = playfield[oxi+oyi*FIELD_WIDTH];
-            if(c) {
-                cucul_set_color(canvas, CUCUL_COLOR_BLACK, blocks_palette[c-1]);
-                cucul_putchar(canvas, x, y, ' ');
-            } else {
-                cucul_set_color(canvas, CUCUL_COLOR_BLACK, CUCUL_COLOR_DARKGRAY);
-                cucul_putchar(canvas, x, y, ' ');
-
-            }
+            cucul_set_color_ansi(canvas, CUCUL_BLACK,
+                                 c ? blocks_palette[c-1] : CUCUL_DARKGRAY);
+            cucul_putchar(canvas, x, y, ' ');
             ox+=incx;
         }