Merge branch 'develop' into SP24-778-Animering-av-knapper

computas · Sep 30, 2024 · 0e1300b · 0e1300b
2 parents 6838518 + 8c4b518
commit 0e1300b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/app/game/game-intermediate-result/game-intermediate-result.component.ts b/src/app/game/game-intermediate-result/game-intermediate-result.component.ts
@@ -45,7 +45,7 @@ export class GameIntermediateResultComponent implements OnInit, OnDestroy {
 
     this.multiplayerService.getLabel(false).subscribe((res) => {
       if (res) {
-        this.gameStateService.nextRound();
+        this.gameStateService.goToPage(GAMESTATE.showWord);
       }
     });
 

diff --git a/src/app/game/game-word-to-draw/game-word-to-draw.component.ts b/src/app/game/game-word-to-draw/game-word-to-draw.component.ts
@@ -132,6 +132,7 @@ export class GameWordToDrawComponent implements OnInit, OnDestroy {
       }
     }
     if (this.isMultiPlayer) {
+      this.gameStateService.updateRoundNumber();
       const player = this.multiplayerService.stateInfo.player_nr;
       this.playernr = player === 'player_1' ? '1' : '2';
       this.guessUsed = this.drawingService.guessUsed;

diff --git a/src/app/game/services/game-state-service.ts b/src/app/game/services/game-state-service.ts
@@ -44,12 +44,16 @@ export class GameStateService {
   }
 
   startGame() {
-    this._currentRound.next(1);
+    if (this.isSingleplayer()) {
+      this._currentRound.next(1);
+    }
     this._currentPage.next(GAMESTATE.showWord);
   }
 
   replayGame() {
-    this._currentRound.next(1);
+    if (this.isSingleplayer()) {
+      this._currentRound.next(1);
+    }
     this._currentPage.next(GAMESTATE.difficultyPicker);
   }