From 889df7a5930b48d807fd1ce7ba0c2a7cf7e32066 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sat, 29 Oct 2022 01:50:34 +0900 Subject: [PATCH] more meaningful init() of the vm --- tsvm_core/src/net/torvald/tsvm/VM.kt | 2 -- tsvm_executable/src/net/torvald/terrarum/imagefont/font.tga | 2 +- tsvm_executable/src/net/torvald/tsvm/ProfilesMenu.kt | 6 +++--- tsvm_executable/src/net/torvald/tsvm/VMEmuExecutable.kt | 2 ++ 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tsvm_core/src/net/torvald/tsvm/VM.kt b/tsvm_core/src/net/torvald/tsvm/VM.kt index a61a5bc..5b9abd8 100644 --- a/tsvm_core/src/net/torvald/tsvm/VM.kt +++ b/tsvm_core/src/net/torvald/tsvm/VM.kt @@ -75,8 +75,6 @@ class VM( // MMIO_SIZE.toInt() - 256, // 64 ) - - init() } fun killAllContexts() { diff --git a/tsvm_executable/src/net/torvald/terrarum/imagefont/font.tga b/tsvm_executable/src/net/torvald/terrarum/imagefont/font.tga index 778d86f..b88a9b9 100644 --- a/tsvm_executable/src/net/torvald/terrarum/imagefont/font.tga +++ b/tsvm_executable/src/net/torvald/terrarum/imagefont/font.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9458daf7338a9f734a90cb3babdcb07249e2f1ab7997e93d05ef8eb64099254e +oid sha256:00ff0568aa4d4e0b528cc1c9ae7bcfb8ac5b4cdba305247ff96af72984529d58 size 93202 diff --git a/tsvm_executable/src/net/torvald/tsvm/ProfilesMenu.kt b/tsvm_executable/src/net/torvald/tsvm/ProfilesMenu.kt index b6d003d..f4d17e0 100644 --- a/tsvm_executable/src/net/torvald/tsvm/ProfilesMenu.kt +++ b/tsvm_executable/src/net/torvald/tsvm/ProfilesMenu.kt @@ -52,8 +52,8 @@ class ProfilesMenu(parent: VMEmuExecutable, x: Int, y: Int, w: Int, h: Int) : Em val isVMrunning = if (theVM != null) !theVM.disposed && theVM.startTime >= 0 else false val vmViewport = parent.getViewportForTheVM(theVM) - val vmRunStatusText = if (isVMrunning) "Running" else "Idle" - val vmViewportText = if (vmViewport != null) "on viewport #${vmViewport+1}" else "hidden" + val vmRunStatusText = if (isVMrunning) "\u00D2\u00D3" else "\u00D0\u00D1" + val vmViewportText = if (vmViewport != null) "on viewport #${vmViewport+1}" else "and hidden" batch.color = colBack it.fillRect(10, 11 + i*2*FONT.H, 228, 26) @@ -61,7 +61,7 @@ class ProfilesMenu(parent: VMEmuExecutable, x: Int, y: Int, w: Int, h: Int) : Em batch.color = colFore FONT.draw(batch, profileNames[index], 12f, 11f + i*2*FONT.H) batch.color = EmulatorGuiToolkit.Theme.COL_ACTIVE3 - FONT.draw(batch, "$vmRunStatusText, $vmViewportText", 12f, 11f+FONT.H + i*2*FONT.H) + FONT.draw(batch, "$vmRunStatusText $vmViewportText", 12f, 11f+FONT.H + i*2*FONT.H) } diff --git a/tsvm_executable/src/net/torvald/tsvm/VMEmuExecutable.kt b/tsvm_executable/src/net/torvald/tsvm/VMEmuExecutable.kt index bdacf5c..bc68b02 100644 --- a/tsvm_executable/src/net/torvald/tsvm/VMEmuExecutable.kt +++ b/tsvm_executable/src/net/torvald/tsvm/VMEmuExecutable.kt @@ -189,6 +189,8 @@ class VMEmuExecutable(val windowWidth: Int, val windowHeight: Int, var panelsX: } private fun initVMenv(vm: VM) { + vm.init() + vm.peripheralTable.getOrNull(1)?.peripheral?.dispose() val gpu = ReferenceGraphicsAdapter2("./assets", vm)