From 64e6d3521c002e5c8a9fa2546a11a3741aa7d62b Mon Sep 17 00:00:00 2001
From: majean5 <mathilde.jean3@etu.uca.fr>
Date: Thu, 17 Nov 2022 11:19:11 +0100
Subject: [PATCH] Correction erreurs de Match (inGame ds classes)

---
 bob_party/src/core/match.ts                | 2 +-
 bob_party/src/core/matchCasino.ts          | 4 ++--
 bob_party/src/core/matchMulti.ts           | 4 ++--
 bob_party/src/core/matchSolo.ts            | 4 ++--
 bob_party/src/core/tests/matchSolo.test.ts | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bob_party/src/core/match.ts b/bob_party/src/core/match.ts
index d7b7c10..3d459a2 100644
--- a/bob_party/src/core/match.ts
+++ b/bob_party/src/core/match.ts
@@ -9,7 +9,7 @@ export abstract class Match{
     private tabUsers:User[];
     private theGame:Game;
 
-    constructor(code:string, tabUser:User[], game:Game){
+    constructor(code:string, inGame:Boolean, tabUser:User[], game:Game){
         this.code=code;
         this.inGame=false;
         this.tabUsers=[...tabUser];
diff --git a/bob_party/src/core/matchCasino.ts b/bob_party/src/core/matchCasino.ts
index a41485f..0c2e2bc 100644
--- a/bob_party/src/core/matchCasino.ts
+++ b/bob_party/src/core/matchCasino.ts
@@ -6,8 +6,8 @@ import { ManagerCoinsUser } from "./User/managerCoinsUser";
 
 export class MatchMulti extends Match{
 
-    constructor(code:string, tabUser:User[], game:GameCasino){
-        super(code, tabUser, game);
+    constructor(code:string, inGame:Boolean, tabUser:User[], game:GameCasino){
+        super(code, inGame, tabUser, game);
     }
 
     updatePostMatch(user:User, coins: number): void {
diff --git a/bob_party/src/core/matchMulti.ts b/bob_party/src/core/matchMulti.ts
index 255fc9a..0bfde7a 100644
--- a/bob_party/src/core/matchMulti.ts
+++ b/bob_party/src/core/matchMulti.ts
@@ -6,8 +6,8 @@ import { ManagerCoinsUser } from "./User/managerCoinsUser";
 
 export class MatchMulti extends Match{
 
-    constructor(code:string, tabUser:User[], game:GameMulti){
-        super(code, tabUser, game);
+    constructor(code:string, inGame:Boolean, tabUser:User[], game:GameMulti){
+        super(code, inGame, tabUser, game);
     }
 
     updatePostMatch(user:User, coins: number): void {
diff --git a/bob_party/src/core/matchSolo.ts b/bob_party/src/core/matchSolo.ts
index e9c0b57..80f9e43 100644
--- a/bob_party/src/core/matchSolo.ts
+++ b/bob_party/src/core/matchSolo.ts
@@ -6,8 +6,8 @@ import { ManagerCoinsUser } from "./User/managerCoinsUser";
 
 export class MatchSolo extends Match{
 
-    constructor(code:string, tabUser:User[], game:GameSolo){
-        super(code, tabUser, game);
+    constructor(code:string, inGame:Boolean, tabUser:User[], game:GameSolo){
+        super(code, inGame, tabUser, game);
     }
 
     updatePostMatch(user:User, coins: number): void {
diff --git a/bob_party/src/core/tests/matchSolo.test.ts b/bob_party/src/core/tests/matchSolo.test.ts
index ea8d483..89c17ac 100644
--- a/bob_party/src/core/tests/matchSolo.test.ts
+++ b/bob_party/src/core/tests/matchSolo.test.ts
@@ -12,7 +12,7 @@ let blue = new Skin("S0002", "Bob Blue", require('bob_party/assets/BobsSkins/Bob
 let tab:Skin[] = [classique, blue];
 let dateBirth = new Date(2010,0o3,0o7);
 let conv:Conversation[] = [];
-let usr = new User('00001', 'Killyan', 'password', 'France', 'M', dateBirth, 0, 0, 0, classique, tab, conv);
+let usr = new User('00001', 'Killyan', 'password', 'France', 'M', dateBirth, 0, 0, 0, classique, tab);
 let tabU:User[] = [usr];
 let myMap = new Map<number, number>([
     [50, 3],
@@ -20,10 +20,10 @@ let myMap = new Map<number, number>([
     [100, 5],
     [150, 6]
 ]);
-let game=new GameSolo("bo jeu", require('bob_party/assets/ImagesJeux/blackjack.jpg'), "super jeu", 1, 1, myMap);
+let game=new GameSolo("G0001", "bo jeu", require('bob_party/assets/ImagesJeux/blackjack.jpg'), "super jeu", 1, 1, myMap);
 let match = new MatchSolo("machin", false, tabU, game);
 let tabU2:User[] = [];
-let game2 = new GameSolo("jeu magnifique", require('bob_party/assets/ImagesJeux/blackjack.jpg'), "wow jeu", 1, 1, myMap)
+let game2 = new GameSolo("G0002", "jeu magnifique", require('bob_party/assets/ImagesJeux/blackjack.jpg'), "wow jeu", 1, 1, myMap)
 
 
 // Get tests