From 90ecda108d211cb20f953475c830c6e14a0f86b5 Mon Sep 17 00:00:00 2001 From: Song Minjae Date: Sun, 18 Sep 2016 20:31:59 +0900 Subject: [PATCH] TIL lua's loadstring is now simply 'load' Former-commit-id: 2e2ee60f28eb3cbdeb9da7877eba4d0774590f87 Former-commit-id: 81c4274951d08267adb5380d5f4fa351ace25fff --- src/net/torvald/terrarum/StateVTTest.kt | 2 +- .../terrarum/virtualcomputer/assets/lua/ROMLIB.lua | 3 ++- .../torvald/terrarum/virtualcomputer/luaapi/Filesystem.kt | 8 -------- .../virtualcomputer/terminal/SimpleTextTerminal.kt | 2 +- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/net/torvald/terrarum/StateVTTest.kt b/src/net/torvald/terrarum/StateVTTest.kt index 1390ff503..4d08008db 100644 --- a/src/net/torvald/terrarum/StateVTTest.kt +++ b/src/net/torvald/terrarum/StateVTTest.kt @@ -19,7 +19,7 @@ import org.newdawn.slick.state.StateBasedGame */ class StateVTTest : BasicGameState() { - val vt = SimpleTextTerminal(SimpleTextTerminal.WHITE, 80, 43, colour = true) + val vt = SimpleTextTerminal(SimpleTextTerminal.WHITE, 80, 25, colour = true) val computerInside = BaseTerrarumComputer(vt) val vtUI = Image(vt.displayW, vt.displayH) diff --git a/src/net/torvald/terrarum/virtualcomputer/assets/lua/ROMLIB.lua b/src/net/torvald/terrarum/virtualcomputer/assets/lua/ROMLIB.lua index e67ddc263..d7c4aee48 100644 --- a/src/net/torvald/terrarum/virtualcomputer/assets/lua/ROMLIB.lua +++ b/src/net/torvald/terrarum/virtualcomputer/assets/lua/ROMLIB.lua @@ -6,9 +6,10 @@ fs.run = function(p) local f = fs.open(p, "r") local s = f.readAll() - fs.dostring(s) + load(s)() end +_G.loadstring = _G.load -------------- -- HEXUTILS -- diff --git a/src/net/torvald/terrarum/virtualcomputer/luaapi/Filesystem.kt b/src/net/torvald/terrarum/virtualcomputer/luaapi/Filesystem.kt index 3865547b7..19513e9dd 100644 --- a/src/net/torvald/terrarum/virtualcomputer/luaapi/Filesystem.kt +++ b/src/net/torvald/terrarum/virtualcomputer/luaapi/Filesystem.kt @@ -38,7 +38,6 @@ internal class Filesystem(globals: Globals, computer: BaseTerrarumComputer) { globals["fs"]["open"] = OpenFile(computer) globals["fs"]["parent"] = GetParentDir(computer) globals["__haltsystemexplicit__"] = HaltComputer(computer) - globals["fs"]["dostring"] = DoString(computer) // fs.run defined in ROMLIB } @@ -336,13 +335,6 @@ internal class Filesystem(globals: Globals, computer: BaseTerrarumComputer) { } } - class DoString(val computer: BaseTerrarumComputer): OneArgFunction() { - override fun call(script: LuaValue): LuaValue { - computer.luaJ_globals.load(script.checkjstring()).call() - return LuaValue.NONE - } - } - ////////////////////////////// diff --git a/src/net/torvald/terrarum/virtualcomputer/terminal/SimpleTextTerminal.kt b/src/net/torvald/terrarum/virtualcomputer/terminal/SimpleTextTerminal.kt index c2dd26a7b..03ba90ace 100644 --- a/src/net/torvald/terrarum/virtualcomputer/terminal/SimpleTextTerminal.kt +++ b/src/net/torvald/terrarum/virtualcomputer/terminal/SimpleTextTerminal.kt @@ -73,7 +73,7 @@ open class SimpleTextTerminal( val screenBuffer = AAFrame(width, height) - open protected val fontRef = "./assets/graphics/fonts/cp949.png" + open protected val fontRef = "./assets/graphics/fonts/MDA.png" open protected val fontImg = Image(fontRef) open protected val fontW = fontImg.width / 16 open protected val fontH = fontImg.height / 16