Changeset 1124Tweet

Timestamp:

Sep 28, 2006, 10:11:08 AM (17 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Adjusted default speed, line removing now works correctly

File:

• cacatris/trunk/src/main.c (modified) (2 diffs)

cacatris/trunk/src/main.c

@@ -19 +19 @@
     unsigned char left = 0, right = 0, down = 0;
     unsigned long long int curTime = 0;
-    unsigned int speed = 32;
+    unsigned int speed = 16;
     unsigned int fixed_y = 0;
     unsigned char lost = 0;
@@ -310 +310 @@
 unsigned char maybe_remove_line(void)
 {
-    int x, v=0;
-    unsigned char *p = &playfield[(FIELD_HEIGHT-1)*FIELD_WIDTH];
+    int y, x, v=0;
+    unsigned char *p = playfield;
     int ret = 0;
-    for(x = 0; x < FIELD_WIDTH ; x++)
-        if(*p++)
-            v++;
-
-    if(v==FIELD_WIDTH) {
-        memmove(&playfield[FIELD_WIDTH], playfield, (FIELD_HEIGHT-1)*FIELD_WIDTH);
-        ret++;
-        ret += maybe_remove_line();
-        return ret;
-    }
+
+    for(y = 0; y < FIELD_HEIGHT ; y++)
+    {
+        for(x = 0; x < FIELD_WIDTH ; x++)
+            if(*p++)
+                v++;
+        if(v==FIELD_WIDTH) {
+            memmove(&playfield[FIELD_WIDTH], playfield, (y)*FIELD_WIDTH);
+            ret++;
+        }
+        v=0;
+    }
+
     return ret;
 }