From f14f4ff21a862af50bd3df4c349e35f086cf3689 Mon Sep 17 00:00:00 2001
From: Thomas von Dein <tom@vondein.org>
Date: Tue, 11 Jun 2024 19:15:40 +0200
Subject: [PATCH] removed unneeded code, fixed game exit from menu

---
 .gitignore  | 1 +
 src/game.go | 2 --
 src/menu.go | 8 ++++++--
 src/play.go | 5 -----
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 59de423..f4d8a9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ rect*
 *prof
 *lif
 *rle
+svgicons
diff --git a/src/game.go b/src/game.go
index e5b229f..a21240f 100644
--- a/src/game.go
+++ b/src/game.go
@@ -10,7 +10,6 @@ type Game struct {
 	CurrentScene                                    SceneName
 	Config                                          *Config
 	Scale                                           float32
-	Screen                                          *ebiten.Image
 }
 
 func NewGame(config *Config, startscene SceneName) *Game {
@@ -34,7 +33,6 @@ func NewGame(config *Config, startscene SceneName) *Game {
 	ebiten.SetWindowResizingMode(ebiten.WindowResizingModeEnabled)
 	ebiten.SetScreenClearedEveryFrame(true)
 
-	game.Screen = ebiten.NewImage(game.ScreenWidth, game.ScreenHeight)
 	return game
 }
 
diff --git a/src/menu.go b/src/menu.go
index b8e4f8e..909bdf8 100644
--- a/src/menu.go
+++ b/src/menu.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"image/color"
-	"os"
 
 	"github.com/ebitenui/ebitenui"
 	"github.com/ebitenui/ebitenui/widget"
@@ -19,6 +18,7 @@ type SceneMenu struct {
 	Ui        *ebitenui.UI
 	FontColor color.RGBA
 	First     bool
+	Exit      bool
 }
 
 func NewMenuScene(game *Game, config *Config) Scene {
@@ -54,6 +54,10 @@ func (scene *SceneMenu) SetNext(next SceneName) {
 func (scene *SceneMenu) Update() error {
 	scene.Ui.Update()
 
+	if scene.Exit {
+		return ebiten.Termination
+	}
+
 	if inpututil.IsKeyJustPressed(ebiten.KeyEscape) || inpututil.IsKeyJustPressed(ebiten.KeyQ) {
 		scene.Config.DelayedStart = false
 		scene.Leave()
@@ -120,7 +124,7 @@ func (scene *SceneMenu) Init() {
 
 	quit := NewMenuButton("Exit Golsky",
 		func(args *widget.ButtonClickedEventArgs) {
-			os.Exit(0)
+			scene.Exit = true
 		})
 
 	rowContainer.AddChild(empty)
diff --git a/src/play.go b/src/play.go
index 82d6257..9c3ce2d 100644
--- a/src/play.go
+++ b/src/play.go
@@ -482,11 +482,6 @@ func (scene *ScenePlay) Draw(screen *ebiten.Image) {
 	scene.Camera.Render(scene.World, screen)
 
 	scene.DrawDebug(screen)
-
-	op.GeoM.Reset()
-	op.GeoM.Translate(0, 0)
-
-	scene.Game.Screen.DrawImage(screen, op)
 }
 
 func (scene *ScenePlay) DrawEvolution(screen *ebiten.Image, x, y int, op *ebiten.DrawImageOptions) {