From 76b745ebeab53410be168b4ef31fd92698e867ed Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20N=C3=A9grier?= <d.negrier@thecodingmachine.com>
Date: Sun, 3 May 2020 15:29:40 +0200
Subject: [PATCH] Putting the name in GameManager rather than passing it from
 scene to scene.

---
 front/src/Phaser/Game/GameManager.ts               | 14 ++++++++++----
 front/src/Phaser/Game/GameScene.ts                 |  7 ++-----
 .../src/Phaser/Game/GameSceneInitDataInterface.ts  |  3 ---
 3 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 front/src/Phaser/Game/GameSceneInitDataInterface.ts

diff --git a/front/src/Phaser/Game/GameManager.ts b/front/src/Phaser/Game/GameManager.ts
index 1877b29..83e205e 100644
--- a/front/src/Phaser/Game/GameManager.ts
+++ b/front/src/Phaser/Game/GameManager.ts
@@ -15,14 +15,16 @@ export class GameManager {
     status: number;
     private ConnexionInstance: Connexion;
     private currentGameScene: GameScene;
+    private playerName: string;
     SimplePeer : SimplePeerInterface;
 
     constructor() {
         this.status = StatusGameManagerEnum.IN_PROGRESS;
     }
-    
-    connect(email:string) {
-        this.ConnexionInstance = new Connexion(email, this);
+
+    connect(name:string) {
+        this.playerName = name;
+        this.ConnexionInstance = new Connexion(name, this);
         ConnexionInstance = this.ConnexionInstance;
         return this.ConnexionInstance.createConnexion().then(() => {
             this.SimplePeer = new SimplePeer(ConnexionInstance);
@@ -57,6 +59,10 @@ export class GameManager {
             console.error(e);
         }
     }
+
+    getPlayerName(): string {
+        return this.playerName;
+    }
 }
 
-export const gameManager = new GameManager();
\ No newline at end of file
+export const gameManager = new GameManager();
diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts
index f5a7728..47499da 100644
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@ -5,7 +5,6 @@ import {DEBUG_MODE, RESOLUTION, ROOM, ZOOM_LEVEL} from "../../Enum/EnvironmentVa
 import Tile = Phaser.Tilemaps.Tile;
 import {ITiledMap, ITiledTileSet} from "../Map/ITiledMap";
 import {cypressAsserter} from "../../Cypress/CypressAsserter";
-import { GameSceneInitDataInterface } from "./GameSceneInitDataInterface";
 
 export const GameSceneName = "GameScene";
 export enum Textures {
@@ -29,7 +28,6 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
     map: ITiledMap;
     startX = (window.innerWidth / 2) / RESOLUTION;
     startY = (window.innerHeight / 2) / RESOLUTION;
-    playerName: string;
 
 
     constructor() {
@@ -69,8 +67,7 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
     }
 
     //hook initialisation
-    init(data: GameSceneInitDataInterface) {
-        this.playerName = data.name;
+    init() {
     }
 
     //hook create scene
@@ -168,7 +165,7 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
             this,
             this.startX,
             this.startY,
-            this.playerName
+            this.GameManager.getPlayerName()
         );
         this.CurrentPlayer.initAnimation();
 
diff --git a/front/src/Phaser/Game/GameSceneInitDataInterface.ts b/front/src/Phaser/Game/GameSceneInitDataInterface.ts
deleted file mode 100644
index 0014e1b..0000000
--- a/front/src/Phaser/Game/GameSceneInitDataInterface.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface GameSceneInitDataInterface {
-    name: string
-}
-- 
2.25.1