refactor(game): improve cleaning game when leaving

mathieuher · Nov 14, 2024 · 2f0f605 · 2f0f605
1 parent 27d7b6e
commit 2f0f605
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/src/app/game/game.ts b/src/app/game/game.ts
@@ -105,6 +105,11 @@ export class Game extends Engine {
         if (_engine.input.keyboard.wasPressed(Config.KEYBOARD_GHOST_KEY)) {
             this.settingsService.setGhosts(!this.settingsService.getSettings().ghosts);
         }
+    }   
+
+    public stopProperly(): void {
+        this.stop();
+        (this.currentScene as Race).cleanRace();
     }
 
     private getLoader(): Loader {

diff --git a/src/app/game/scenes/race.ts b/src/app/game/scenes/race.ts
@@ -113,6 +113,18 @@ export class Race extends Scene {
         (this.engine as Game).soundPlayer.playSound(Resources.FinishRaceSound, Config.FINISH_SOUND_VOLUME);
     }
 
+    public cleanRace(): void {
+        this.startTime = undefined;
+        this.endTime = undefined;
+        this.uiManager.hideUi();
+        this.gates = [];
+        (this.engine as Game).soundPlayer.stopSound(Resources.WinterSound);
+        (this.engine as Game).soundPlayer.stopSound(Resources.TurningSound);
+        Resources.FinishRaceSound.stop();
+        this.killActors();
+        this.clear();
+    }
+
     public addPenalty(): void {
         this.startTime! -= Config.MISSED_GATE_PENALTY_TIME;
         (this.engine as Game).soundPlayer.playSound(Resources.GateMissedSound, Config.GATE_MISSED_SOUND_VOLUME);
@@ -215,18 +227,6 @@ export class Race extends Scene {
         (this.engine as Game).soundPlayer.playSound(Resources.WinterSound, Config.RACE_AMBIANCE_SOUND_VOLUME, true);
     }
 
-    private cleanRace(): void {
-        this.startTime = undefined;
-        this.endTime = undefined;
-        this.uiManager.hideUi();
-        this.gates = [];
-        (this.engine as Game).soundPlayer.stopSound(Resources.WinterSound);
-        (this.engine as Game).soundPlayer.stopSound(Resources.TurningSound);
-        Resources.FinishRaceSound.stop();
-        this.killActors();
-        this.clear();
-    }
-
     private killActors(): void {
         for (const actor of this.actors) {
             actor.kill();

diff --git a/src/app/pages/race/race.component.ts b/src/app/pages/race/race.component.ts
@@ -90,7 +90,7 @@ export class RaceComponent extends Destroyable implements OnInit, OnDestroy{
 
     constructor() {
         super();
-        if (!event) {
+        if (!this.localEventService.getEvent()) {
             this.router.navigate(['/local-event']);
         }
     }
@@ -111,13 +111,10 @@ export class RaceComponent extends Destroyable implements OnInit, OnDestroy{
     }
 
     public override ngOnDestroy(): void {
-        this.game?.stop();
-        this.game = undefined;
+        this.game?.stopProperly();     
     }
 
     protected exitRace(): void {
-        this.game!.stop();
-        this.game = undefined;
         this.router.navigate(['/local-event']);
     }