jadedctrl/ flora-search-aurora
1
0
Disbranĉigi 0
Fontkodo Issues Tirpetoj Eldonoj 1 Activity

Fix pausing and unpausing, remove stderr debugging ♥

This commit is contained in:
Jaidyn Ann 2023-07-15 05:35:09 -05:00
parent 147f22454d
commit 85fec31840
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dialogue.lisp
View File

@ -234,7 +234,7 @@ height — all parameters for use with RENDER-STRING & co."
(- (getf coords :x) 3)))) (- (getf coords :x) 3))))
(lines (ignore-errors (str:lines (…:linewrap-string text text-width)))) (lines (ignore-errors (str:lines (…:linewrap-string text text-width))))
(text-height (length lines))) (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 this layout is valid…
(when (and lines (when (and lines
(>= height text-height) ;; If the text’ll fit on screen (>= 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-y-margin 1)))
(text-width (floor (* width 3/5))) ;; Too wide’s illegible! So ⅗-screen. (text-width (floor (* width 3/5))) ;; Too wide’s illegible! So ⅗-screen.
(lines (ignore-errors (str:lines (…:linewrap-string text text-width))))) (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 the text can be printed with this layout…
(when (and lines (>= text-height (length lines))) (when (and lines (>= text-height (length lines)))
(let* ((y (…:at-least (let* ((y (…:at-least

4
menu.lisp
View File

@ -167,8 +167,8 @@ That is, 0 for non-selected items and 100 for selected items."
('⌨:↳ (progn (select-down-menu-item menu-plist) ('⌨:↳ (progn (select-down-menu-item menu-plist)
(select-right-menu-item menu-plist) (select-right-menu-item menu-plist)
't)) 't))
('⌨:❎ ;; ('⌨:❎
(list :drop 1)) ;; (list :drop 1))
('⌨:🆗 ('⌨:🆗
(if (getf selected-item :exec) (if (getf selected-item :exec)
(apply (getf selected-item :exec) '()) (apply (getf selected-item :exec) '())

1
overworld.lisp
View File

@ -237,6 +237,7 @@ Returns parameters to be used in the next invocation of OVERWORLD-STATE."
(list :function (list :function
(📋:make-menu-function (📋:make-menu-function
`((:en "Continue" :eo "Malpaŭzigi" `((:en "Continue" :eo "Malpaŭzigi"
:parameters ,(list :map map)
:drop 1 :selected t :selection 50) :drop 1 :selected t :selection 50)
(:en "Backpack" :eo "Sako" (:en "Backpack" :eo "Sako"
:function ,(🎒:make-inventory-function map) :function ,(🎒:make-inventory-function map)