From b4287ad61ec1e1c32ed012273ed40d24da20e965 Mon Sep 17 00:00:00 2001 From: iegod Date: Fri, 8 Nov 2024 07:29:34 -0500 Subject: [PATCH] Cleanup. --- game.go | 4 ++-- hero.go | 8 ++++---- mover.go | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/game.go b/game.go index 8df75f3..1b2a9c5 100644 --- a/game.go +++ b/game.go @@ -368,7 +368,7 @@ func (g *Game) UpdateProjectiles() { func (g *Game) UpdateTargets() { for _, target := range g.targets { - if !target.Hit && g.hero.Action < MoverActionDying { + if !target.Hit && g.hero.Action < HeroActionDying { dx := g.hero.Pos.X - target.Pos.X dy := g.hero.Pos.Y - target.Pos.Y angle := math.Atan2(dy, dx) @@ -380,7 +380,7 @@ func (g *Game) UpdateTargets() { } //compute collision with hero - if g.hero.Pos.X >= target.Pos.X-MOVER_WIDTH/2 && g.hero.Pos.X <= target.Pos.X+MOVER_WIDTH/2 && g.hero.Pos.Y >= target.Pos.Y-MOVER_HEIGHT/2 && g.hero.Pos.Y <= target.Pos.Y+MOVER_HEIGHT/2 && target.Action < MoverActionDying && g.hero.Action < MoverActionDying { + if g.hero.Pos.X >= target.Pos.X-MOVER_WIDTH/2 && g.hero.Pos.X <= target.Pos.X+MOVER_WIDTH/2 && g.hero.Pos.Y >= target.Pos.Y-MOVER_HEIGHT/2 && g.hero.Pos.Y <= target.Pos.Y+MOVER_HEIGHT/2 && target.Action < MoverActionDying && g.hero.Action < HeroActionDying { g.heroCollisionMask.Clear() g.heroCollisionMask.DrawImage(g.hero.Sprite, nil) diff --git a/hero.go b/hero.go index 07503ae..650ed71 100644 --- a/hero.go +++ b/hero.go @@ -68,9 +68,9 @@ type Hero struct { func NewHero() *Hero { m := &Hero{ - Sprite: ebiten.NewImage(48, 48), - Maks: ebiten.NewImage(48, 48), - MaksDest: ebiten.NewImage(48, 48), + Sprite: ebiten.NewImage(MOVER_WIDTH, MOVER_HEIGHT), + Maks: ebiten.NewImage(MOVER_WIDTH, MOVER_HEIGHT), + MaksDest: ebiten.NewImage(MOVER_WIDTH, MOVER_HEIGHT), Action: HeroActionDefault, cycles: 4, Angle: 0, @@ -139,7 +139,7 @@ func (m *Hero) Update() { // one hit death for the hero func (m *Hero) SetHit() { - m.Action = MoverActionDying + m.Action = HeroActionDying m.dyingcount = 0 m.Angle = 0 m.cycles = 0 diff --git a/mover.go b/mover.go index f1ad348..6cd9fa2 100644 --- a/mover.go +++ b/mover.go @@ -83,9 +83,9 @@ type Mover struct { func NewMover() *Mover { m := &Mover{ - Sprite: ebiten.NewImage(48, 48), - Maks: ebiten.NewImage(48, 48), - MaksDest: ebiten.NewImage(48, 48), + Sprite: ebiten.NewImage(MOVER_WIDTH, MOVER_HEIGHT), + Maks: ebiten.NewImage(MOVER_WIDTH, MOVER_HEIGHT), + MaksDest: ebiten.NewImage(MOVER_WIDTH, MOVER_HEIGHT), Action: MoverActionDefault, cycles: 4, Angle: 0,