- Timestamp:
- Oct 18, 2008, 11:29:49 PM (12 years ago)
- Location:
- cacatris/trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
cacatris/trunk/configure.ac
r2540 r2981 27 27 28 28 CACA="no" 29 PKG_CHECK_MODULES(CACA, caca >= 0.99.beta 9,29 PKG_CHECK_MODULES(CACA, caca >= 0.99.beta15, 30 30 [CACA="yes"], 31 31 [AC_MSG_RESULT(no) 32 AC_MSG_ERROR([you need libcaca version 0.99.beta 9or later])])32 AC_MSG_ERROR([you need libcaca version 0.99.beta15 or later])]) 33 33 34 34 # Optimizations -
cacatris/trunk/src/cacatris.h
r1458 r2981 20 20 #endif 21 21 22 23 #include "cucul.h" 24 #include "caca.h" 25 22 #include <caca.h> 26 23 27 24 #define INFO_WIDTH 20 -
cacatris/trunk/src/main.c
r1755 r2981 28 28 unsigned char total_lines = 0; 29 29 30 field = c ucul_create_canvas(0, 0);31 infos = c ucul_create_canvas(0, 0);32 screen = c ucul_create_canvas(0, 0);30 field = caca_create_canvas(0, 0); 31 infos = caca_create_canvas(0, 0); 32 screen = caca_create_canvas(0, 0); 33 33 34 34 dp = caca_create_display(screen); … … 36 36 return 1; 37 37 38 c ucul_set_canvas_size(infos, INFO_WIDTH, cucul_get_canvas_height(screen));39 c ucul_set_canvas_size(field, FIELD_CANVAS_WIDTH, FIELD_CANVAS_HEIGHT);38 caca_set_canvas_size(infos, INFO_WIDTH, caca_get_canvas_height(screen)); 39 caca_set_canvas_size(field, FIELD_CANVAS_WIDTH, FIELD_CANVAS_HEIGHT); 40 40 41 41 caca_set_display_time(dp, 20000); … … 46 46 47 47 /* Set current and next piece to random */ 48 current_piece = c ucul_rand(0, 6);49 next_piece = c ucul_rand(0, 6);48 current_piece = caca_rand(0, 6); 49 next_piece = caca_rand(0, 6); 50 50 51 51 … … 138 138 remove_piece(current_piece, x ,y, rotation); 139 139 /* blit infos canvas into general one */ 140 c ucul_blit(screen, (cucul_get_canvas_width(screen)) - INFO_WIDTH, 0, infos, NULL);140 caca_blit(screen, (caca_get_canvas_width(screen)) - INFO_WIDTH, 0, infos, NULL); 141 141 /* blit playfield canvas into general one */ 142 c ucul_blit(screen, 18, 0, field, NULL);142 caca_blit(screen, 18, 0, field, NULL); 143 143 144 144 caca_refresh_display(dp); … … 152 152 current_piece = next_piece; 153 153 rotation = 0; 154 next_piece = c ucul_rand(0, 6);154 next_piece = caca_rand(0, 6); 155 155 last_has_landed = 1; 156 156 old_x = x; … … 181 181 end: 182 182 caca_free_display(dp); 183 c ucul_free_canvas(field);184 c ucul_free_canvas(infos);185 c ucul_free_canvas(screen);183 caca_free_canvas(field); 184 caca_free_canvas(infos); 185 caca_free_canvas(screen); 186 186 187 187 return 0; … … 189 189 190 190 191 void infos_populate(c ucul_canvas_t *inf, unsigned int score,191 void infos_populate(caca_canvas_t *inf, unsigned int score, 192 192 unsigned char level, unsigned char total) 193 193 { 194 unsigned int i;195 194 char scoreline[256]; 196 195 char levelline[256]; 197 196 char totalline[256]; 197 int i; 198 198 199 199 sprintf(scoreline, " Score : %05d ", score); … … 201 201 sprintf(totalline, " Lines : %02d ", total); 202 202 203 c ucul_set_color_ansi(inf, CUCUL_WHITE, CUCUL_BLUE);204 c ucul_put_str(inf, 0, 0, " =Cacatris= ");205 c ucul_put_str(inf, 0, 1, " Arrows : move ");206 c ucul_put_str(inf, 0, 2, " Space : pouf ");207 c ucul_put_str(inf, 0, 3, " __________________ ");208 c ucul_put_str(inf, 0, 4, " ");209 c ucul_put_str(inf, 0, 5, levelline);210 c ucul_put_str(inf, 0, 6, scoreline);211 c ucul_put_str(inf, 0, 7, totalline);212 c ucul_put_str(inf, 0, 8, " Time : XX:XX ");213 214 for(i = 8; i < c ucul_get_canvas_height(inf); i++)215 { 216 c ucul_put_str(inf, 0, i," ");217 } 218 } 219 220 221 void playfield_draw(c ucul_canvas_t *canvas)203 caca_set_color_ansi(inf, CACA_WHITE, CACA_BLUE); 204 caca_put_str(inf, 0, 0, " =Cacatris= "); 205 caca_put_str(inf, 0, 1, " Arrows : move "); 206 caca_put_str(inf, 0, 2, " Space : pouf "); 207 caca_put_str(inf, 0, 3, " __________________ "); 208 caca_put_str(inf, 0, 4, " "); 209 caca_put_str(inf, 0, 5, levelline); 210 caca_put_str(inf, 0, 6, scoreline); 211 caca_put_str(inf, 0, 7, totalline); 212 caca_put_str(inf, 0, 8, " Time : XX:XX "); 213 214 for(i = 8; i < caca_get_canvas_height(inf); i++) 215 { 216 caca_put_str(inf, 0, i," "); 217 } 218 } 219 220 221 void playfield_draw(caca_canvas_t *canvas) 222 222 { 223 223 unsigned int x, y; … … 233 233 unsigned int oyi = (unsigned int) oy; 234 234 unsigned int c = playfield[oxi+oyi*FIELD_WIDTH]; 235 c ucul_set_color_ansi(canvas, CUCUL_BLACK,236 c ? blocks_palette[c-1] : CUCUL_DARKGRAY);237 c ucul_put_char(canvas, x, y, ' ');235 caca_set_color_ansi(canvas, CACA_BLACK, 236 c ? blocks_palette[c-1] : CACA_DARKGRAY); 237 caca_put_char(canvas, x, y, ' '); 238 238 ox+=incx; 239 239 }
Note: See TracChangeset
for help on using the changeset viewer.