Skip to content
Snippets Groups Projects
Commit 3f8b8e88 authored by RUESCAS GWENDAL's avatar RUESCAS GWENDAL :tropical_fish:
Browse files

Merge branch 'master' into 'master'

Nouveau .jar

See merge request !16
parents 4717c982 e614f501
1 merge request!16Nouveau .jar
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
...@@ -143,6 +143,7 @@ public class G_Data{ ...@@ -143,6 +143,7 @@ public class G_Data{
Integer bonus = ((Long) ch.get("bonus")).intValue(); Integer bonus = ((Long) ch.get("bonus")).intValue();
Integer goTo = ((Long) ch.get("goto")).intValue(); Integer goTo = ((Long) ch.get("goto")).intValue();
choix.add(new Choix(name,intLogiciel,reputation,degats,bonus,txt,goTo)); choix.add(new Choix(name,intLogiciel,reputation,degats,bonus,txt,goTo));
System.out.println(choix.get(0).getName() + " " + name);
} }
contextes.add(new Contexte(id,titre,texte,choix)); contextes.add(new Contexte(id,titre,texte,choix));
} }
......
...@@ -11,6 +11,7 @@ public class Choix { ...@@ -11,6 +11,7 @@ public class Choix {
private String texte; private String texte;
public Choix(String name, Integer intLogiciel, Integer reputation, Integer degats, Integer bonus, String texte, Integer goTo){ public Choix(String name, Integer intLogiciel, Integer reputation, Integer degats, Integer bonus, String texte, Integer goTo){
this.name = name;
this.texte = texte; this.texte = texte;
this.intLogiciel = intLogiciel; this.intLogiciel = intLogiciel;
this.reputation = reputation; this.reputation = reputation;
......
...@@ -67,7 +67,6 @@ public class IHM_Jeu extends JPanel{ ...@@ -67,7 +67,6 @@ public class IHM_Jeu extends JPanel{
final Integer index = id; final Integer index = id;
System.out.println(c.getName()); System.out.println(c.getName());
JButton jbChoix = new JButton(c.getName()); JButton jbChoix = new JButton(c.getName());
jbChoix.setPreferredSize(new Dimension(40, 20));
jbChoix.addActionListener(new ActionListener() { jbChoix.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
ecouteurChoix(index); ecouteurChoix(index);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment