From 8972de8c69ab22d6a073fcc09b72f52a78f299f1 Mon Sep 17 00:00:00 2001 From: sam Date: Thu, 9 Nov 2006 10:54:49 +0000 Subject: [PATCH] * Update code to make use of libcaca 0.99.beta9. * Update TODO. git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/ttyvaders/trunk@1312 92316355-f0b4-4df1-b90c-862c8a59935f --- TODO | 39 +++++++++++++++++++++------------------ configure.ac | 4 ++-- src/ttyvaders.c | 12 ++++++------ 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/TODO b/TODO index 553129e..dd7dbb5 100644 --- a/TODO +++ b/TODO @@ -1,31 +1,34 @@ $Id$ - o Let the ship pick up bonuses + - Add ground and air vehicles, make it moon-buggy on steroids! - o Alien swarms, programmed behaviour + - Provide several sets of sprites (monochrome, ANSI, UTF-8). - o Spiral weapon (vertical sine) + - Let the ship pick up bonuses - o Stick aliens to tunnel + - Alien swarms, programmed behaviour - o Change tunnel colour + - Spiral weapon (vertical sine) - o Draw bosses + - Stick aliens to tunnel - o Promote precision for all coordinates except screen + - Change tunnel colour - o Animate the ship + - Draw bosses - o The nuke should break the tunnel - Or at least a bit + - Promote precision for all coordinates except screen - o The laser stays alive when the ship explodes + - Animate the ship - o DONE 12 Nov 2003: Write a generic drawing library with automatic clipping - o DONE 23 Dec 2002: Handle life - o DONE 23 Dec 2002: Mega ball - o DONE 23 Dec 2002: Fragmentation bomb (merge with mega-ball?) - o DONE 23 Dec 2002: Fill holes in the tunnel when |step| > 2 - o DONE 19 Dec 2002: Tunnel sometimes doesn't get drawn on the left - o DONE 18 Dec 2002: Draw a 3rd alien type + - The nuke should break the tunnel (or at least a bit) + + - The laser stays alive when the ship explodes + + - DONE 12 Nov 2003: Write a generic drawing library with automatic clipping + - DONE 23 Dec 2002: Handle life + - DONE 23 Dec 2002: Mega ball + - DONE 23 Dec 2002: Fragmentation bomb (merge with mega-ball?) + - DONE 23 Dec 2002: Fill holes in the tunnel when |step| > 2 + - DONE 19 Dec 2002: Tunnel sometimes doesn't get drawn on the left + - DONE 18 Dec 2002: Draw a 3rd alien type diff --git a/configure.ac b/configure.ac index da6e8ec..0266b96 100644 --- a/configure.ac +++ b/configure.ac @@ -26,10 +26,10 @@ if test "$build" != "$host" -a "${PKG_CONFIG_LIBDIR}" = ""; then fi CACA="no" -PKG_CHECK_MODULES(caca, caca, +PKG_CHECK_MODULES(caca, caca >= 0.99.beta9, [CACA="yes"], [AC_MSG_RESULT(no) - AC_MSG_ERROR([you need libcaca version 0.99 or later])]) + AC_MSG_ERROR([you need libcaca version 0.99.beta9 or later])]) # Optimizations CFLAGS="${CFLAGS} -g -O2 -fno-strength-reduce -fomit-frame-pointer" diff --git a/src/ttyvaders.c b/src/ttyvaders.c index 89d8ea0..0e72d5a 100644 --- a/src/ttyvaders.c +++ b/src/ttyvaders.c @@ -109,7 +109,7 @@ static void display_ground(void) for(i = 0; i < 80; i++) { /* Draw the sky */ - cucul_set_color(cv, CUCUL_COLOR_LIGHTBLUE, CUCUL_COLOR_LIGHTCYAN); + cucul_set_color_ansi(cv, CUCUL_LIGHTBLUE, CUCUL_LIGHTCYAN); for(j = h - 24; j < h - 18 + ((40 - i) * (40 - i) / (40 * 40 / 10)) + (i & 1); j++) cucul_putchar(cv, i, j, ' '); cucul_putchar(cv, i, j++, 0x2591); @@ -121,7 +121,7 @@ static void display_ground(void) cucul_putchar(cv, i, j++, 0x2593); cucul_putchar(cv, i, j++, 0x2593); cucul_putchar(cv, i, j++, 0x2593); - cucul_set_color(cv, CUCUL_COLOR_LIGHTBLUE, CUCUL_COLOR_LIGHTBLUE); + cucul_set_color_ansi(cv, CUCUL_LIGHTBLUE, CUCUL_LIGHTBLUE); for( ; j < h; j++) cucul_putchar(cv, i, j, ' '); @@ -129,14 +129,14 @@ static void display_ground(void) /* Draw the ground */ j = h - ground[i]; - cucul_set_color(cv, CUCUL_COLOR_BLACK, CUCUL_COLOR_LIGHTBLUE); + cucul_set_color_ansi(cv, CUCUL_BLACK, CUCUL_LIGHTBLUE); if(i >= 4 && ground[i] == ground[i - 6] && ground[i] != ground[i - 7]) { cucul_putstr(cv, i - 3, j - 2, "Omm"); cucul_putstr(cv, i - 6, j - 1, "(/)-(/)"); } - cucul_set_color(cv, CUCUL_COLOR_RED, CUCUL_COLOR_GREEN); + cucul_set_color_ansi(cv, CUCUL_RED, CUCUL_GREEN); if(ground[i + 1] > ground[i]) cucul_putchar(cv, i, j++, 0x2588); // UTF-8: 0x259f else if(ground[i + 1] < ground[i]) @@ -146,7 +146,7 @@ static void display_ground(void) } else cucul_putchar(cv, i, j++, 0x2584); - cucul_set_color(cv, CUCUL_COLOR_RED, CUCUL_COLOR_BROWN); + cucul_set_color_ansi(cv, CUCUL_RED, CUCUL_BROWN); cucul_putchar(cv, i, j++, 0x2593); cucul_putchar(cv, i, j++, 0x2592); cucul_putchar(cv, i, j++, 0x2591); @@ -160,7 +160,7 @@ static void display_stuff(void) cucul_blit(cv, shipx, shipy, ship, NULL); cucul_blit(cv, 68, h - 22, alien, NULL); cucul_blit(cv, 52, h - 16, alien, NULL); - cucul_set_color(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE); + cucul_set_color_ansi(cv, CUCUL_WHITE, CUCUL_BLUE); cucul_printf(cv, 2, h - 2, " %i fps ", 1000000 / (1 + caca_get_display_time(dp))); }