laure.bel
/
OOP_F3_Project
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of 

https://gitarero.ecam.fr/laure.bel/OOP_F3_Project.git
This commit is contained in:
Laure BEL 2024-05-29 18:12:58 +02:00
parent bff9c08ec0 17c204a812
commit c9ad5776e1
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/backend/Simulator.java
View File

@ -50,9 +50,9 @@ public class Simulator extends Thread {
//Default rule : Survive always, birth never //Default rule : Survive always, birth never
for(int i =0; i<9; i++) { //for(int i =0; i<9; i++) {
fieldSurviveValues.add(i); // fieldSurviveValues.add(i);
} //}
} }
@ -63,7 +63,24 @@ public class Simulator extends Thread {
public int getHeight() { public int getHeight() {
return LINE_NUM; return LINE_NUM;
} }
<<<<<<< HEAD
=======
public World getWorld(){
return world;
}
public int getCell(int x, int y) {
return world.getCell(x, y);
}
public void setWorld(World world) {
this.world = world;
}
>>>>>>> branch 'master' of https://gitarero.ecam.fr/laure.bel/OOP_F3_Project.git
//Should probably stay as is //Should probably stay as is
public void run() { public void run() {
stepCount=0; stepCount=0;