From 7f87814d35a877a255157d46001fb72db0f1c7e3 Mon Sep 17 00:00:00 2001
From: Nyeogmi <economicsbat@gmail.com>
Date: Wed, 14 Feb 2024 14:10:19 -0800
Subject: [PATCH] Remove unused code

---
 engine.lua            | 33 ---------------------------------
 main.p8               |  1 -
 state_gameround.lua   |  4 +++-
 state_restartmenu.lua | 24 ------------------------
 4 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 state_restartmenu.lua

diff --git a/engine.lua b/engine.lua
index 590002a..bd3f249 100644
--- a/engine.lua
+++ b/engine.lua
@@ -32,39 +32,6 @@ function klass()
  return k
 end
 
-function alives(tbl)
- local tbl2={}
- for i in all(tbl) do
-  if (not i.dead) add(tbl2,i)
- end
- return tbl2
-end
-
-function trunc4(x)
- if (x < 0) return -trunc4(-x)
- return x\0.25/4
-end
-
-function stepstep(by,x0,x1,f)
- local x=x0
- if (x==x1) return
- if x0>x1 then
-  return stepstep(by,-x0,-x1,function(x) return f(-x) end)
- end
-
- x=x\by*by
-
- while true do
-  x+=by
-  if (x>=x1) f(x1) break
-  if (not f(x)) break
- end
-end
-
-function lerp(x,x0,x1)
- return x0+x*(x1-x0)
-end
-
 function gsv(s)
  local ret=split(s,"\n")
  for i,v in ipairs(ret) do
diff --git a/main.p8 b/main.p8
index 21c54ef..ba2ceeb 100644
--- a/main.p8
+++ b/main.p8
@@ -31,7 +31,6 @@ __lua__
 #include state_gameround.lua
 #include state_ironman.lua
 #include state_reset_menu.lua
-#include state_restartmenu.lua
 #include state_wonironman.lua
 #include state_wonround.lua
 #include tutorial.lua
diff --git a/state_gameround.lua b/state_gameround.lua
index 00de139..9eb67ea 100644
--- a/state_gameround.lua
+++ b/state_gameround.lua
@@ -30,8 +30,10 @@ function state_gameround:update()
  local restart_progress=self.restart_frames/60
  self.board:set_restart_progress(restart_progress)
 
+
  if restart_progress>=1.0 then
-  main.state_manager:push(state_restartmenu:new())
+  self.outcome="restart"
+  self.done=true
   return
  end
 
diff --git a/state_restartmenu.lua b/state_restartmenu.lua
deleted file mode 100644
index eb1d86d..0000000
--- a/state_restartmenu.lua
+++ /dev/null
@@ -1,24 +0,0 @@
-state_restartmenu=klass()
-function state_restartmenu:init()
-end
-function state_restartmenu:enter()
- -- for now, make this only a restart button
- self.outcome="restart" self.done=true
-end
-function state_restartmenu:exit(new_top) 
- new_top.outcome=self.outcome
- new_top.done=true
-end
-
-function state_restartmenu:reenter() end
-function state_restartmenu:suspend() end
-
-function state_restartmenu:update()
- if (btnp(0)) self.outcome="menu" self.done=true
- if (btnp(4)) self.outcome="restart" self.done=true
-end
-function state_restartmenu:draw()
- cls(13)
- print("⬅️ back to menu",1,58,7)
- print("🅾️ restart",1,64,7)
-end
\ No newline at end of file