From 34007175b90cf2ad85c327817ed79c3927cb66b0 Mon Sep 17 00:00:00 2001 From: Constant Date: Fri, 27 Mar 2026 21:32:03 +0100 Subject: [PATCH] resolve conflicts --- projet_linea/bin/Jeu.class | Bin 9138 -> 9179 bytes projet_linea/src/Jeu.java | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/projet_linea/bin/Jeu.class b/projet_linea/bin/Jeu.class index 6d952fd9aae27cd034c575d9e3afb693b318a3ff..2c08254f2351dd5b2054289f3cd7dd41bd3160e6 100644 GIT binary patch delta 503 zcmY+B%S&596vn@Aa?QPlSWFWUHxVC!k_v?iU3FDULlqPhMK?aM=|UG4(H6R~-E`T_ z;3kXEMbUy_@fE~{ASi-=fZ+SBRa@V-8ug~<3NGB7-#5RR!<=CTBMTAFj6F6E;3ZQ7 zo@Rf62Tfe@a+M*%+tkw5*%588YHn+fJ_Nb$#W!x~5B@LQ*S5dZeZ&)!$GSZ5n5X(< zAnrZ1_?J*mXz@Z9W)&M(L`Zi9LT-~cL{MUI=zG?W^z;ZUxB>Nfs5+O*Y78eh*NZw` zpI1~{6duOw7(xO&!8F0BF@h_H2`&gqzDj8w<+7kAj*M`f(0DU~8W9uDfibQD2}}*h z+gwAP+Vvg33EH>i-%ooOTyxJJIjB%Wr%#ox}%{KEs`14(D{TiNHg_{U3;9uY}i H(?-sJFdBv+ delta 436 zcmY+BODKd<6vzMnJ0IU?LdJX(V}YU2P*WruHi#rCSy>TfrXy4~Y9LPV-w zvyi6NBRlhgmlETJ?&S}X9)80UUqm`Zyz-qN@csbb CfNf>~ diff --git a/projet_linea/src/Jeu.java b/projet_linea/src/Jeu.java index 8c11b26..77b8303 100644 --- a/projet_linea/src/Jeu.java +++ b/projet_linea/src/Jeu.java @@ -424,7 +424,7 @@ public class Jeu implements KeyListener, ActionListener{ this.ecran.partiePerdue = true; // 2. Signaler à l'écran this.ecran.repaint(); // 3. Forcer l'affichage du texte - // GestionBDD.ajouterScore((int)this.score);// enregistrement du score dans la base de donne + GestionBDD.ajouterScore((int)this.score, this.utilisateurId);// enregistrement du score dans la base de donne } } if (chronoBonus>0) {