guillaume.bonabau
/
OOP_F1_Project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev_bnb' of https://gitarero.ecam.fr/guillaume.bonabau/OOP_F1_Project into dev_bnb

This commit is contained in:
Guillaume BONABAU 2024-04-10 16:06:29 +02:00
parent 20d4ba1a0f 343c71dc31
commit b11eba4039
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/Simulator.java
View File

@ -116,6 +116,7 @@ public class Simulator extends Thread {
Table tempTable = new Table(this.height, this.width);
for(int x=0; x<width; x++) {
for(int y=0; y<height; y++) {
<<<<<<< HEAD
if (this.table.getCell(x, y).getValue()=1) {
if (table.countNear(x,y)<2) {
tempTable.getCell(x,y).setValue(0);
@ -132,6 +133,13 @@ public class Simulator extends Thread {
}
}
this.table = tempTable;
=======
if (table.countNear(x,y)<2) {
tempTable.getCell(x,y).setValue(0);
}
}
}
>>>>>>> 343c71dc317aee3d5caa32ac9b6c57dd3ac996bc
/* you should distribute this action in methods/classes
* don't write everything here !