diff --git a/konstructor/engine/engine.go b/konstructor/engine/engine.go index 4163453..258836c 100644 --- a/konstructor/engine/engine.go +++ b/konstructor/engine/engine.go @@ -20,32 +20,32 @@ func (e *Engine) Layout(outsideWidth, outsideHeight int) (int, int) { func (e *Engine) Update(screen *ebiten.Image) error { e.WatchKeyPress() - if e.KContext.ScreenTypeIs("menu") { + if e.KContext.ScreenTypeIs(entity.MenuScreenType) { e.MenuUpdate() } - if e.KContext.ScreenTypeIs("dialog") { + if e.KContext.ScreenTypeIs(entity.DialogScreenType) { e.DialogUpdate() } - if e.KContext.ScreenTypeIs("playground") { + if e.KContext.ScreenTypeIs(entity.PlaygroundScreenType) { e.PlaygroundUpdate() } - if e.KContext.ScreenTypeIs("inventory") { + if e.KContext.ScreenTypeIs(entity.InventoryScreenType) { e.InventoryUpdate() } return nil } func (e *Engine) Draw(screen *ebiten.Image) { - if e.KContext.ScreenTypeIs("menu") { + if e.KContext.ScreenTypeIs(entity.MenuScreenType) { e.MenuDraw(screen) } - if e.KContext.ScreenTypeIs("dialog") { + if e.KContext.ScreenTypeIs(entity.DialogScreenType) { e.DialogDraw(screen) } - if e.KContext.ScreenTypeIs("playground") { + if e.KContext.ScreenTypeIs(entity.PlaygroundScreenType) { e.PlaygroundDraw(screen) } - if e.KContext.ScreenTypeIs("inventory") { + if e.KContext.ScreenTypeIs(entity.InventoryScreenType) { e.InventoryDraw(screen) } if e.Action3Pressed() { diff --git a/konstructor/entity/entity.kcontext.go b/konstructor/entity/entity.kcontext.go index dec2c25..7e967b5 100644 --- a/konstructor/entity/entity.kcontext.go +++ b/konstructor/entity/entity.kcontext.go @@ -1,7 +1,7 @@ package entity type KContext struct { - ScreenType string + ScreenType ScreenType ScreenValue string CurrentLevel int Players []Player @@ -11,6 +11,6 @@ func (c *KContext) getPrimaryPlayer() Player { return c.Players[0] } -func (c *KContext) ScreenTypeIs(name string) bool { +func (c *KContext) ScreenTypeIs(name ScreenType) bool { return c.ScreenType == name } diff --git a/konstructor/entity/entity.screen.go b/konstructor/entity/entity.screen.go new file mode 100644 index 0000000..d70082f --- /dev/null +++ b/konstructor/entity/entity.screen.go @@ -0,0 +1,10 @@ +package entity + +type ScreenType string + +const ( + MenuScreenType ScreenType = "menu" + DialogScreenType ScreenType = "dialog" + PlaygroundScreenType ScreenType = "playground" + InventoryScreenType ScreenType = "inventory" +) diff --git a/main.go b/main.go index e4a49ca..abe4034 100644 --- a/main.go +++ b/main.go @@ -23,7 +23,7 @@ func main() { }, }, KContext: &entity.KContext{ - ScreenType: "menu", + ScreenType: entity.MenuScreenType, ScreenValue: "MainMenu", CurrentLevel: 0, },