From 8e8a58bac339aa06e860b977670f16c8b4eb30a8 Mon Sep 17 00:00:00 2001 From: Sophia Pearson Date: Tue, 4 Oct 2022 22:29:47 +0200 Subject: scenes: reinstate credits and game start --- Scripts/Credits.cs | 9 ++++----- Scripts/Menus/MainMenu.cs | 4 ++-- addons/ClassExporter/plugin.cfg | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Scripts/Credits.cs b/Scripts/Credits.cs index 1955656..5432d02 100644 --- a/Scripts/Credits.cs +++ b/Scripts/Credits.cs @@ -2,14 +2,13 @@ using Godot; namespace Texty.Scripts { - public class Credits : Node + public partial class Credits : Node { - public override void _UnhandledKeyInput(InputEventKey @event) + public override void _UnhandledKeyInput(InputEvent @event) { - if (@event.Scancode == (uint)KeyList.Escape) + if (@event is InputEventKey { Keycode: Key.Escape }) { - var menu = ResourceLoader.Load("res://Scenes/Menus/MainMenu.tscn"); - GetTree().ChangeSceneTo(menu); + GetTree().ChangeSceneToFile("res://Scenes/Menus/MainMenu.tscn"); } } } diff --git a/Scripts/Menus/MainMenu.cs b/Scripts/Menus/MainMenu.cs index 155df3e..2991fec 100644 --- a/Scripts/Menus/MainMenu.cs +++ b/Scripts/Menus/MainMenu.cs @@ -10,12 +10,12 @@ namespace Texty.Scripts.Menus private void OnStartButtonPressed() { - GD.Print("Start button was pressed."); + GetTree().ChangeSceneToFile("res://Scenes/Game/Game.tscn"); } private void OnCreditsButtonPressed() { - GD.Print("Credits button was pressed."); + GetTree().ChangeSceneToFile("res://Scenes/Credits.tscn"); } private void OnQuitButtonPressed() diff --git a/addons/ClassExporter/plugin.cfg b/addons/ClassExporter/plugin.cfg index bc7c3b7..91185b3 100644 --- a/addons/ClassExporter/plugin.cfg +++ b/addons/ClassExporter/plugin.cfg @@ -4,4 +4,4 @@ name = "C# Class Exporter" description = "Add C# Node and Resource classes to Godot" author = "Sophia Pearson" version = "1.0.0" -script = "Plugin.cs" \ No newline at end of file +script = "Plugin.cs" -- cgit v1.2.3