screen to scene

2026-08-30 00:15:26 +02:00
parent 94649a38fe
commit da1410cb4a
62 changed files with 623 additions and 615 deletions
@@ -32,7 +32,7 @@ func (w *world) PumpTick(dt float64) {
 		Game: w.G,
 		DT:   dt,
 	}
-	if s, ok := w.G.SceneManager.Get(w.scene); ok {
+	if s, ok := w.G.SceneManager.Get(w.G.CurrentScene()); ok {
 		ctx.Scene = &s
 	}
 	if w.running.Tick(ctx) != inkwell.StatusRunning {
@@ -41,7 +41,7 @@ func (w *world) PumpTick(dt float64) {
 }

 func (w *world) sceneTitle() string {
-	s, ok := w.G.SceneManager.Get(w.scene)
+	s, ok := w.G.SceneManager.Get(w.G.CurrentScene())
 	if !ok {
 		return ""
 	}
@@ -88,24 +88,6 @@ func SetMode(m Mode) inkwell.Action {
 	return Fn(func(*inkwell.Ctx) { World.SetMode(m) })
 }

-func EnterScene(name string) inkwell.Action {
-	return Fn(func(*inkwell.Ctx) {
-		if name != World.scene {
-			World.prev = World.scene
-		}
-		World.scene = name
-	})
-}
-
-func Back() inkwell.Action {
-	return Fn(func(ctx *inkwell.Ctx) {
-		if World.prev == "" {
-			return
-		}
-		inkwell.GoTo(World.prev).Start().Tick(ctx)
-	})
-}
-
 func TapeSay(speaker, text string) inkwell.Action {
 	return &tapeSayAction{
 		speaker: speaker,