Diff: include/cMatrice.h

Revision:

10:9ef3f520ff6c

Parent:

9:6f3d8b714a59

Child:

11:c37922a0a915

diff -r 6f3d8b714a59 -r 9ef3f520ff6c include/cMatrice.h
--- a/include/cMatrice.h	Wed Apr 06 21:53:55 2016 +0000
+++ b/include/cMatrice.h	Thu Apr 07 15:24:07 2016 +0000
@@ -9,30 +9,39 @@
 
 class cMatrice {
 private:
+	cForme * _pForme;
 	unsigned char ** _matrice;
 	unsigned char _col;
 	unsigned char _lig;
+	////////////////////////////////////////////////////////
+	// Gestion des collisions aux bords
+	////////////////////////////////////////////////////////
+	bool _collisionBordGauche;
+	bool _collisionBordDroit;
+	bool _collisionBordBas;
+	void controleCollisionBords();
+	////////////////////////////////////////////////////////
+	// Gestion des collisions aux pièces
+	////////////////////////////////////////////////////////
 protected:
 public:
 // CONSTRUCTEUR
 	cMatrice();
-	cMatrice(unsigned char c, unsigned char l);
+	cMatrice(unsigned char, unsigned char);
 
 // DESTRUCTEUR
 	virtual ~cMatrice();
 
 // GETTER
-	unsigned char getValTab(unsigned char l, unsigned char c);
+	unsigned char getValTab(unsigned char, unsigned char);
 	unsigned char getCol();
 	unsigned char getLig();
 // SETTER
-	void updateMatrice(cForme &);
 	void setCol(unsigned char);
 	void setLig(unsigned char);
 // METHODES
-	void envoyerMatrice();
-	void afficherForme(cForme &, unsigned char c);
-	void ajouterForme(cForme &, unsigned char c);
+	int updateMatrice();
+	void afficherForme(cForme * f, unsigned char c);
 	void clear();
 };