summaryrefslogtreecommitdiff
path: root/shop2
diff options
context:
space:
mode:
authorubq323 <ubq323@ubq323.website>2023-01-07 05:25:27 +0000
committerubq323 <ubq323@ubq323.website>2023-01-07 05:25:27 +0000
commit9decfea1b6aefabe7a8efaee2cb0b1e8ea152024 (patch)
tree4a36524554380dd61ccefc0a2be11617d34eee1f /shop2
parentccd7438702f15d94edf091aea178b83785a44e08 (diff)
shop2
Diffstat (limited to 'shop2')
-rw-r--r--shop2/disp.lua2
-rw-r--r--shop2/main.lua4
2 files changed, 4 insertions, 2 deletions
diff --git a/shop2/disp.lua b/shop2/disp.lua
index 65aebc5..43777ac 100644
--- a/shop2/disp.lua
+++ b/shop2/disp.lua
@@ -89,4 +89,4 @@ local function run()
end
end
-disp_shopscreen()
+return {run=run}
diff --git a/shop2/main.lua b/shop2/main.lua
index 67d3dba..e4995cc 100644
--- a/shop2/main.lua
+++ b/shop2/main.lua
@@ -90,7 +90,9 @@ local function run_shop()
end
end
-print(pcall(parallel.waitForAny,run_shop))
+local run_disp = require"shop2.disp".run
+
+print(pcall(parallel.waitForAny,run_shop,run_disp))
-- print("hi")
-- peripheral.call("top","clear")
-- peripheral.call("left","clear")