diff --git a/konstructor/engine.go b/konstructor/engine.go index a13e981..474083c 100755 --- a/konstructor/engine.go +++ b/konstructor/engine.go @@ -22,5 +22,5 @@ func (g *GameEngine) Draw(screen *ebiten.Image) { } func (g *GameEngine) Layout(outsideWidth, outsideHeight int) (int, int) { - return g.Konstructor.GameSettings.ScreenSettings.Width, g.Konstructor.GameSettings.ScreenSettings.Height + return g.Konstructor.Settings.Screen.Width, g.Konstructor.Settings.Screen.Height } diff --git a/konstructor/konstructor.go b/konstructor/konstructor.go index 2e52c6f..082a63c 100755 --- a/konstructor/konstructor.go +++ b/konstructor/konstructor.go @@ -18,21 +18,21 @@ type ScreenSettings struct { Height int } -type GameSettings struct { - Name string - ScreenSettings ScreenSettings +type Settings struct { + Name string + Screen ScreenSettings } type Konstructor struct { - Context ContextInterface - Domain DomainInterface - Controller Controller - GameSettings GameSettings + Context ContextInterface + Domain DomainInterface + Controller Controller + Settings Settings } func (k Konstructor) Init() { - ebiten.SetWindowSize(k.GameSettings.ScreenSettings.Width, k.GameSettings.ScreenSettings.Height) - ebiten.SetWindowTitle(k.GameSettings.Name) + ebiten.SetWindowSize(k.Settings.Screen.Width, k.Settings.Screen.Height) + ebiten.SetWindowTitle(k.Settings.Name) if err := ebiten.RunGame(&GameEngine{ Konstructor: k, }); err != nil { diff --git a/main.go b/main.go index 6a15ad5..401d514 100755 --- a/main.go +++ b/main.go @@ -32,9 +32,9 @@ func main() { Action3: ebiten.KeyEscape, }, }, - GameSettings: konstructor.GameSettings{ + Settings: konstructor.Settings{ Name: "Game", - ScreenSettings: konstructor.ScreenSettings{ + Screen: konstructor.ScreenSettings{ Width: 640, Height: 480, },