haissous/SAE41_2022
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix de qq bugs en HotSeat

Browse Source
This commit is contained in:
Haïssous Kayyissa 2023-04-09 10:06:57 +02:00
parent 04f5c17704
commit 03f89a8f32
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/example/mastermind/ChoiceCombi.java
View File

@ -35,7 +35,7 @@ public class ChoiceCombi extends Activity implements SaisieActivity {
for (int i=0;i<this.saisie.getSizeSelection();i++) {
tabpions[i] = this.saisie.getSelection()[i];
}
returnIntent.putExtra("choix", this.saisie.getSelection());
returnIntent.putExtra("choix", tabpions);
setResult(Activity.RESULT_OK, returnIntent);
finish();
}

2
app/src/main/java/com/example/mastermind/game/Saisie.java
View File

@ -40,7 +40,7 @@ public class Saisie {
//addSelection permet d'ajouter un pion par index à la zone de saisie
public void addSelection(int indexcolor){
//On vérifie qu'il n'y a pas déjà 4 pions
if (this.sizeSelection<4){
if (this.sizeSelection<4&&this.choix.size()>indexcolor){
this.selection.set(this.sizeSelection,this.choix.get(indexcolor));
this.sizeSelection+=1;
}