From 09d5921d759f511050d280fc316aeb61647d00b3 Mon Sep 17 00:00:00 2001 From: Enzo JOLYS Date: Fri, 31 Mar 2023 11:25:54 +0200 Subject: [PATCH] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'Tetris/app/src/mai?= =?UTF-8?q?n/java/modele/DashBoard.kt'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tetris/app/src/main/java/modele/DashBoard.kt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Tetris/app/src/main/java/modele/DashBoard.kt b/Tetris/app/src/main/java/modele/DashBoard.kt index 53fc94a..864ff55 100644 --- a/Tetris/app/src/main/java/modele/DashBoard.kt +++ b/Tetris/app/src/main/java/modele/DashBoard.kt @@ -89,10 +89,14 @@ class DashBoard(private val width: Int,private val height: Int,private val view: // ATTENTION ELLE BUG PAS DE COLLISION fun moveRight(shape:Shape):Position{ - //Check les limite du tableau à droite !!!! NE MARCHE PAS ATTENTION !!! - var limite = width-shape.position.getX() - if (limite >= 4 ){ + //Check les limite du tableau à droite !!!! A vérifier que ca marche !!! + var limiteInitial = width-shape.position.getX() + var limite:Int = 0 + + if (limiteInitial >= 4 ){ limite = 4 + }else { + limite = limiteInitial } for ( line in 0..3){ // Check si le décalage est possible @@ -105,8 +109,10 @@ class DashBoard(private val width: Int,private val height: Int,private val view: return shape.position } }else{ + if ( limite == limiteInitial and shape.typeShape.showShape[line][column] == 1){ + return shape.position + } if ((shape.typeShape.showShape[line][column] == 1) - and (shape.typeShape.showShape[line][column] == 0) and (gridOfGame[shape.position.getX() + line][shape.position.getY() + column + 1] == 1) ) { return shape.position