mirror of
https://codeberg.org/scip/golsky.git
synced 2025-12-16 04:00:59 +01:00
removed unneeded code, fixed game exit from menu
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -6,3 +6,4 @@ rect*
|
||||
*prof
|
||||
*lif
|
||||
*rle
|
||||
svgicons
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user