From ef824cdf009de9b891efd104d69fecce599c29a5 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 20 Aug 2013 05:48:18 +0000 Subject: [PATCH] Make this actually compile again. --- .../LoLShield_Tetris/LoLShield_Tetris.h | 56 +++++++++++++++++++ .../LoLShield_Tetris/LoLShield_Tetris.pde | 34 +---------- 2 files changed, 57 insertions(+), 33 deletions(-) create mode 100644 lib/examples/LoLShield_Tetris/LoLShield_Tetris.h diff --git a/lib/examples/LoLShield_Tetris/LoLShield_Tetris.h b/lib/examples/LoLShield_Tetris/LoLShield_Tetris.h new file mode 100644 index 0000000..9ae51ac --- /dev/null +++ b/lib/examples/LoLShield_Tetris/LoLShield_Tetris.h @@ -0,0 +1,56 @@ +/* + Tetris, an adaptation for LOL Shield for Arduino + Copyright 2009/2010 Aurélien Couderc + With the kind help and good ideas of Benjamin Sonntag http://benjamin.sonntag.fr/ + + History: + 2010-01-01 - V1.0 Initial version, at Berlin after 26C3 :D + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. +*/ + +/** + * The coord struct holds an (x,y) pair, as used in the pieces declarations + * an in the position structure. + */ +typedef struct coord { + int8_t x; + int8_t y; +} coord_t; + +/** + * One piece view. Each Tetris piece may have one to four views. + */ +typedef struct pieceView { + coord_t elements[4]; +} pieceView_t; + +/** + * One Tetris piece object, made of one to four views. + */ +typedef struct piece { + pieceView_t** views; + uint8_t numViews; +} piece_t; + +/** + * Structure to hold the current position and view of the piece + * being played. + */ +typedef struct pos { + coord_t coord; + uint8_t view; +} pos_t; diff --git a/lib/examples/LoLShield_Tetris/LoLShield_Tetris.pde b/lib/examples/LoLShield_Tetris/LoLShield_Tetris.pde index b6bdaed..f2087b7 100644 --- a/lib/examples/LoLShield_Tetris/LoLShield_Tetris.pde +++ b/lib/examples/LoLShield_Tetris/LoLShield_Tetris.pde @@ -24,6 +24,7 @@ #include "Charliplexing.h" #include "Figure.h" +#include "LoLShield_Tetris.h" /** The current level. */ int level; @@ -41,39 +42,6 @@ boolean playGrid[GRID_HEIGHT][GRID_WIDTH]; const uint8_t NUM_LEVEL_STEPS = 4; const uint32_t LEVEL_STEPS[NUM_LEVEL_STEPS] = {200,600,1800,5400}; -/** - * The coord struct holds an (x,y) pair, as used in the pieces declarations - * an in the position structure. - */ -typedef struct coord { - int8_t x; - int8_t y; -} coord_t; - -/** - * One piece view. Each Tetris piece may have one to four views. - */ -typedef struct pieceView { - coord_t elements[4]; -} pieceView_t; - -/** - * One Tetris piece object, made of one to four views. - */ -typedef struct piece { - pieceView_t** views; - uint8_t numViews; -} piece_t; - -/** - * Structure to hold the current position and view of the piece - * being played. - */ -typedef struct pos { - coord_t coord; - uint8_t view; -} pos_t; - // The single view of the square piece : // 00 // 00