From 85fec318408f80f3059400a5f695173f1e9dc3c5 Mon Sep 17 00:00:00 2001 From: Jaidyn Ann <10477760+JadedCtrl@users.noreply.github.com> Date: Sat, 15 Jul 2023 05:35:09 -0500 Subject: [PATCH] =?UTF-8?q?Fix=20pausing=20and=20unpausing,=20remove=20std?= =?UTF-8?q?err=20debugging=20=E2=99=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dialogue.lisp | 4 ++-- menu.lisp | 4 ++-- overworld.lisp | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dialogue.lisp b/dialogue.lisp index 58d5678..2f9b6a2 100644 --- a/dialogue.lisp +++ b/dialogue.lisp @@ -234,7 +234,7 @@ height — all parameters for use with RENDER-STRING & co." (- (getf coords :x) 3)))) (lines (ignore-errors (str:lines (…:linewrap-string text text-width)))) (text-height (length lines))) - (format *error-output* "HORIZ COORD: ~A HEIGHT: ~A WIDTH ~A LINES:~%~S~%" coords text-height text-width lines) +;; (format *error-output* "HORIZ COORD: ~A HEIGHT: ~A WIDTH ~A LINES:~%~S~%" coords text-height text-width lines) ;; When this layout is valid… (when (and lines (>= height text-height) ;; If the text’ll fit on screen @@ -271,7 +271,7 @@ height (for use as parameters with RENDER-STRING et al.)." (- text-y-margin 1))) (text-width (floor (* width 3/5))) ;; Too wide’s illegible! So ⅗-screen. (lines (ignore-errors (str:lines (…:linewrap-string text text-width))))) - (format *error-output* "VERT HEIGHT: ~A WIDTH ~A LINES: ~A~%" text-height text-width lines) +;; (format *error-output* "VERT HEIGHT: ~A WIDTH ~A LINES: ~A~%" text-height text-width lines) ;; When the text can be printed with this layout… (when (and lines (>= text-height (length lines))) (let* ((y (…:at-least diff --git a/menu.lisp b/menu.lisp index b6e7fdd..81da393 100644 --- a/menu.lisp +++ b/menu.lisp @@ -167,8 +167,8 @@ That is, 0 for non-selected items and 100 for selected items." ('⌨:↳ (progn (select-down-menu-item menu-plist) (select-right-menu-item menu-plist) 't)) - ('⌨:❎ - (list :drop 1)) +;; ('⌨:❎ +;; (list :drop 1)) ('⌨:🆗 (if (getf selected-item :exec) (apply (getf selected-item :exec) '()) diff --git a/overworld.lisp b/overworld.lisp index b4b06e7..92bec83 100644 --- a/overworld.lisp +++ b/overworld.lisp @@ -237,6 +237,7 @@ Returns parameters to be used in the next invocation of OVERWORLD-STATE." (list :function (📋:make-menu-function `((:en "Continue" :eo "Malpaŭzigi" + :parameters ,(list :map map) :drop 1 :selected t :selection 50) (:en "Backpack" :eo "Sako" :function ,(🎒:make-inventory-function map)