From c5e40103a2e22a0fce8333040289ef8eaccfdb22 Mon Sep 17 00:00:00 2001 From: Renge Date: Sat, 23 Apr 2022 22:06:52 -0400 Subject: [PATCH] fix: bugs in GameOver --- src/shattered_sword/Scenes/GameLevel.ts | 2 ++ src/shattered_sword/Scenes/GameOver.ts | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/shattered_sword/Scenes/GameLevel.ts b/src/shattered_sword/Scenes/GameLevel.ts index b48fa36..d35b092 100644 --- a/src/shattered_sword/Scenes/GameLevel.ts +++ b/src/shattered_sword/Scenes/GameLevel.ts @@ -359,7 +359,9 @@ export default class GameLevel extends Scene { this.respawnPlayer(); } else{ //no more lives + this.viewport.setZoomLevel(1); this.sceneManager.changeToScene(GameOver, {}); + InputWrapper.enableInput(); } break; case "startStory": diff --git a/src/shattered_sword/Scenes/GameOver.ts b/src/shattered_sword/Scenes/GameOver.ts index 0394720..9cf3627 100644 --- a/src/shattered_sword/Scenes/GameOver.ts +++ b/src/shattered_sword/Scenes/GameOver.ts @@ -1,9 +1,10 @@ import Vec2 from "../../Wolfie2D/DataTypes/Vec2"; -import Input from "../../Wolfie2D/Input/Input"; import Label from "../../Wolfie2D/Nodes/UIElements/Label"; import { UIElementType } from "../../Wolfie2D/Nodes/UIElements/UIElementTypes"; import Scene from "../../Wolfie2D/Scene/Scene"; import Color from "../../Wolfie2D/Utils/Color"; +import InputWrapper from "../Tools/InputWrapper"; +import MainMenu from "./MainMenu"; export default class GameOver extends Scene { @@ -12,7 +13,17 @@ export default class GameOver extends Scene { this.addUILayer("primary"); - const gameOver =