Changeset 1111 for cacatris/trunk/srcTweet

Timestamp:

Sep 26, 2006, 11:41:10 PM (17 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Added preliminary score counting system (ok it sucks), and down key (ok, it sucks as well) (but I'm drunk AHAH)

Location:

cacatris/trunk/src

Files:

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

cacatris/trunk/src/cacatris.h

@@ -50 +50 @@
 
 
-void infos_populate(cucul_canvas_t *);
+void infos_populate(cucul_canvas_t *, unsigned int score);
 void playfield_draw(cucul_canvas_t *);
 void put_piece(unsigned int, unsigned int, unsigned int, unsigned int);

cacatris/trunk/src/main.c

@@ -21 +21 @@
     unsigned int speed = 32;
     unsigned int fixed_y = 0;
-
+    unsigned char lost = 0;
+    unsigned int  score = 0;
+    unsigned int lines = 0;
 
     field = cucul_create_canvas(0, 0);
@@ -80 +82 @@
         }
 
+        if(lost) continue;
+
+
+        if(y==0 && has_landed(current_piece, x ,y, rotation)) {
+            lost = 1;
+            continue;
+        }
+
         if(left)
         {
@@ -89 +99 @@
             if(movable(current_piece, x+1, y, rotation))
                 x++;
+        }
+        if(down)
+        {
+            while((movable(current_piece, x-1, y, rotation)) && (!has_landed(current_piece, x-1, y, rotation)))
+            {
+                fixed_y+=speed;
+                y = fixed_y>>8;
+            }
         }
 
@@ -111 +129 @@
 
         /* Populate info canvas */
-        infos_populate(infos);
+        infos_populate(infos, score);
         /* Draw everything on playfield */
         put_piece(current_piece, x ,y, rotation);
@@ -137 +155 @@
         }
 
-
-        maybe_remove_line();
+        lines = maybe_remove_line();
+        if(lines)
+        {
+            score += (lines*40);
+
+        }
 
         if(!baseTime)
@@ -154 +176 @@
 
 
-void infos_populate(cucul_canvas_t *inf)
+void infos_populate(cucul_canvas_t *inf, unsigned int score)
 {
     unsigned int i;
+    char scoreline[1024];
+
+    sprintf(scoreline, " Score    :   %05d ", score);
+
     cucul_set_color(inf, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
     cucul_putstr(inf, 0, 0,"      =Cacatris=    ");
@@ -163 +189 @@
     cucul_putstr(inf, 0, 3," __________________ ");
     cucul_putstr(inf, 0, 4,"                    ");
-    cucul_putstr(inf, 0, 5," Score    :   NXXXX ");
+    cucul_putstr(inf, 0, 5,scoreline);
     cucul_putstr(inf, 0, 6," Time     :   XX:XX ");
 
@@ -287 +313 @@
     int x, v=0;
     unsigned char *p = &playfield[(FIELD_HEIGHT-1)*FIELD_WIDTH];
+    int ret = 0;
     for(x = 0; x < FIELD_WIDTH ; x++)
         if(*p++)
@@ -293 +320 @@
     if(v==FIELD_WIDTH) {
         memmove(&playfield[FIELD_WIDTH], playfield, (FIELD_HEIGHT-1)*FIELD_WIDTH);
-        return 1;
+        ret += maybe_remove_line();
+        return ret;
     }
     return 0;