diff --git a/game/game.go b/game/game.go index 9c30096..3a4a5e1 100644 --- a/game/game.go +++ b/game/game.go @@ -54,10 +54,6 @@ func NewGame() *Game { alertbox: elements.NewAlert(), fluidsimd: elements.NewFluidSimD(), flask: elements.NewRoundedBottomFlask(), - //fluidsim10: elements.NewFluidSim10(gamedata.Vector{X: GameFSDW, Y: GameFSDH}), - //fluidsimgpt: elements.NewFlipFluidEntity(640, 480, 2, 1, 100), - - //fluidsim10: elements.NewFluidSim10(), } g.Initialize() @@ -71,12 +67,11 @@ func (g *Game) Update() error { if !g.paused { switch g.fluidsimidx { case 0: - g.fluidsimd.Update() - case 1: - //g.fluidsimgpt.Update() - g.UpdateFluidsim10() - case 2: g.UpdateFlask() + case 1: + g.fluidsimd.Update() + case 2: + g.UpdateFluidsim10() default: break } @@ -98,11 +93,12 @@ func (g *Game) Draw(screen *ebiten.Image) { switch g.fluidsimidx { case 0: - g.RenderFluidSimD(screen) - case 1: - g.RenderFluidSim10(screen) - case 2: g.RenderFlask(screen) + case 1: + g.RenderFluidSimD(screen) + case 2: + g.RenderFluidSim10(screen) + default: break } @@ -155,11 +151,12 @@ func (g *Game) ParseInputs() { //simulation specific updates switch g.fluidsimidx { case 0: - g.ManageFluidSimDInputs() - case 1: - g.ManageFluidSim10Inputs() - case 2: g.ManageFlaskInputs() + case 1: + g.ManageFluidSimDInputs() + case 2: + g.ManageFluidSim10Inputs() + default: break } diff --git a/resources/rounded_bottom_flask_boundary_map_46.png b/resources/rounded_bottom_flask_boundary_map_46.png index 4af5d1b..84e4e86 100644 Binary files a/resources/rounded_bottom_flask_boundary_map_46.png and b/resources/rounded_bottom_flask_boundary_map_46.png differ