diff --git a/Tp5/minesweeper/minesweeper.py b/Tp5/minesweeper/minesweeper.py index 64ad2d3c077a34e1d511216b1de17191792957d4..4a9eeb1bef10f2575de6a3484a907d427a476a1f 100755 --- a/Tp5/minesweeper/minesweeper.py +++ b/Tp5/minesweeper/minesweeper.py @@ -218,25 +218,21 @@ class Minesweeper(): GameState.losing """ - Cell=self.get_cell(x,y) + cell=self.grid[x][y] + + cell.reveal() if Cell.is_bomb: self.state=GameState.losing - else: - Cell.is_revealed=True - if Cell.nbomb_in_neighborhood==0: - - - neighbor =self.get_neighbors(x,y) - for neighbor in neighbors: + elif Cell.nbomb_in_neighborhood==0: + for (xn,yn) in neighborhood(x,y, self.width, self.height): + if not self.grid[yn][xn].is_revealed: + self.reveal_all_cells_from(xn, yn) - if not neighbor.is_revealed: - - self.reveal_all_Cells_from(neighbor.x,neighbor.y) - if self.all_Cells_are_revealed_or_bomb(): - - self.state=GameState.winning - - + if self.all_cells_are_revealed_or_bomb() : + self.state=GameState.winning + + + if (__name__ == '__main__'): import apl1test