Diff: TetrisGame/TetrisGame.h

Revision:

4:7ddd287a5d28

Parent:

3:522c6f850e91

diff -r 522c6f850e91 -r 7ddd287a5d28 TetrisGame/TetrisGame.h
--- a/TetrisGame/TetrisGame.h	Sun May 24 11:18:33 2020 +0000
+++ b/TetrisGame/TetrisGame.h	Sun May 31 17:01:53 2020 +0000
@@ -6,8 +6,6 @@
 #include "Gamepad.h"
 #include "Tetromino.h"
 
-#define GAP 0
-
 class TetrisGame 
 {
     
@@ -15,31 +13,40 @@
     TetrisGame();
     ~TetrisGame();
     
-    void init(int tetromino_width, int tetromino_height, int tetromino_size, int speed);
+    void init(int number, int x, int y, int speed);
     void read_input(Gamepad &pad);
     void update(Gamepad &pad);
     void draw(N5110 &lcd);
+    //void play_game();
+    void exit_game();
+    void cancel_line();
     
     private:
     
     void check_wall_collision(Gamepad &pad);
-    void check_tetromino_collision(Gamepad &pad);
-    void check_goal(Gamepad &pad);
+    void check_tetromino_collisions();
+    // void check_score(Gamepad &pad);
+    
+  //  void cancel_line(N5110 &lcd);
+ //   void gameover(N5110 &lcd);
     
     Tetromino _p1;
     
-    int _tetromino_width;
-    int _tetromino_height;
-    int _tetromino_size;
+    int _number;
+    int _x;
+    int _y;
     int _speed;
+    int blocknumber;
+    int blockArray[5];
     
-    int _p1x;
+    //_old_tetromino;
+    
+    // int _p1x;
     
     Tetromino _tetromino;
     
     Direction _d;
     float _mag;
-    
 };
 
 #endif
\ No newline at end of file