Changeset 1125 for cacatris/trunkTweet

Timestamp:

Sep 28, 2006, 10:29:45 AM (15 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Scoring and levels implementation (following standard Tetris(c)(tm) rules)

Location:

cacatris/trunk/src

Files:

• cacatris.h (modified) (2 diffs)
• main.c (modified) (4 diffs)

cacatris/trunk/src/cacatris.h

@@ -29 +29 @@
 #define FIELD_CANVAS_WIDTH 20
 #define FIELD_CANVAS_HEIGHT 20
+
+#define LEVEL_COUNT 11
+
+unsigned int points[LEVEL_COUNT*4] = {
+        40,     80,     120,    160,    200,    240,    280,    320,    360,    400,    440,
+        100,    200,    300,    400,    500,    600,    700,    800,    900,    1000,   1100,
+        300,    600,    900,    1200,   1500,   1800,   2100,   2400,   2700,   3000,   3300,
+        1200,   2400,   3600,   4800,   6000,   7200,   8400,   9600,   10800,  12000,  13200
+};
+
 
 unsigned char playfield[FIELD_WIDTH*FIELD_HEIGHT];
@@ -50 +60 @@
 
 
-void infos_populate(cucul_canvas_t *, unsigned int score);
+void infos_populate(cucul_canvas_t *, unsigned int score, unsigned char level);
 void playfield_draw(cucul_canvas_t *);
 void put_piece(unsigned int, unsigned int, unsigned int, unsigned int);

cacatris/trunk/src/main.c

@@ -24 +24 @@
     unsigned int  score = 0;
     unsigned int lines = 0;
+    unsigned char level = 0;
+    unsigned char total_lines = 0;
 
     field = cucul_create_canvas(0, 0);
@@ -129 +131 @@
 
         /* Populate info canvas */
-        infos_populate(infos, score);
+        infos_populate(infos, score, level);
         /* Draw everything on playfield */
         put_piece(current_piece, x ,y, rotation);
@@ -158 +160 @@
         if(lines)
         {
-            score += (lines*40);
-
+            score += points[level+(lines-1)*LEVEL_COUNT];
+            total_lines += lines;
+            if(total_lines >=10 && level<=10)
+            {
+                level++;
+                total_lines = 0;
+                speed+=2;
+                memset(playfield, 0, FIELD_WIDTH*FIELD_HEIGHT);
+            }
         }
 
@@ -176 +185 @@
 
 
-void infos_populate(cucul_canvas_t *inf, unsigned int score)
+void infos_populate(cucul_canvas_t *inf, unsigned int score, unsigned char level)
 {
     unsigned int i;
     char scoreline[1024];
+    char levelline[1024];
 
     sprintf(scoreline, " Score    :   %05d ", score);
+    sprintf(levelline, " Level    :   %02d    ", level);
 
     cucul_set_color(inf, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
-    cucul_putstr(inf, 0, 0,"      =Cacatris=    ");
-    cucul_putstr(inf, 0, 1,"  Arrows  :    move ");
-    cucul_putstr(inf, 0, 2,"  Space :      pouf ");
-    cucul_putstr(inf, 0, 3," __________________ ");
-    cucul_putstr(inf, 0, 4,"                    ");
-    cucul_putstr(inf, 0, 5,scoreline);
-    cucul_putstr(inf, 0, 6," Time     :   XX:XX ");
-
-    for(i = 6; i < cucul_get_canvas_height(inf); i++)
+    cucul_putstr(inf, 0, 0, "      =Cacatris=    ");
+    cucul_putstr(inf, 0, 1, "  Arrows  :    move ");
+    cucul_putstr(inf, 0, 2, "  Space :      pouf ");
+    cucul_putstr(inf, 0, 3, " __________________ ");
+    cucul_putstr(inf, 0, 4, "                    ");
+    cucul_putstr(inf, 0, 5, levelline);
+    cucul_putstr(inf, 0, 6, scoreline);
+    cucul_putstr(inf, 0, 7, " Time     :   XX:XX ");
+
+    for(i = 7; i < cucul_get_canvas_height(inf); i++)
     {
         cucul_putstr(inf, 0, i,"                     ");