[langband-cvs] CVS: langband constants.lisp,1.111.2.10,1.111.2.11 generics.lisp,1.138.2.1,1.138.2.2 global.lisp,1.323.2.13,1.323.2.14 loop.lisp,1.277.2.24,1.277.2.25 print.lisp,1.118.4.5,1.118.4.6 util.lisp,1.123.2.31,1.123.2.32 package.lisp,1.109.2.13,1.109.2.14

[Stig E S. <st...@us...>]

Update of /cvsroot/langband/langband
In directory sc8-pr-cvs1:/tmp/cvs-serv9136

Modified Files:
      Tag: v017_loop_experiment_2
	constants.lisp generics.lisp global.lisp loop.lisp print.lisp 
	util.lisp package.lisp 
Log Message:
tweaked how printouts and hooks for redraws work.. complete revamp

Index: constants.lisp
===================================================================
RCS file: /cvsroot/langband/langband/constants.lisp,v
retrieving revision 1.111.2.10
retrieving revision 1.111.2.11
diff -C2 -d -r1.111.2.10 -r1.111.2.11
*** constants.lisp	13 Oct 2003 15:26:25 -0000	1.111.2.10
--- constants.lisp	14 Oct 2003 16:36:52 -0000	1.111.2.11
***************
*** 75,78 ****
--- 75,80 ----
  (define-redraw-key [misc] "...")
  (define-redraw-key [level] "...")
+ (define-redraw-key [race] "...")
+ (define-redraw-key [class] "...")
  (define-redraw-key [xp] "...")
  (define-redraw-key [armour] "...")
***************
*** 283,286 ****
--- 285,289 ----
  (def-exportconst +max-winrow+ 1024 "What is the maximum expected number of rows in a window.")
  
+ (def-exportconst +winflag-normal-paint+ #x00)
  (def-exportconst +winflag-clear-bg+ #x01)
  (def-exportconst +winflag-delay-paint+ #x02)

Index: generics.lisp
===================================================================
RCS file: /cvsroot/langband/langband/generics.lisp,v
retrieving revision 1.138.2.1
retrieving revision 1.138.2.2
diff -C2 -d -r1.138.2.1 -r1.138.2.2
*** generics.lisp	23 Sep 2003 09:32:52 -0000	1.138.2.1
--- generics.lisp	14 Oct 2003 16:36:52 -0000	1.138.2.2
***************
*** 719,725 ****
  
  
- (defgeneric print-speed (variant player setting)
-   (:documentation "prints speed-info."))
- 
  (defgeneric gain-power-level! (variant player)
    (:documentation "The player just gained a level."))
--- 719,722 ----
***************
*** 736,742 ****
  (defgeneric print-misc-info (variant player setting)
    (:documentation "Tries to print misc-info about a player to a clear window."))
- 
- (defgeneric print-armour-class (variant player setting)
-   (:documentation "Tries to print armour class data in the left column."))
  
  (defgeneric print-hunger (variant player setting)
--- 733,736 ----

Index: global.lisp
===================================================================
RCS file: /cvsroot/langband/langband/global.lisp,v
retrieving revision 1.323.2.13
retrieving revision 1.323.2.14
diff -C2 -d -r1.323.2.13 -r1.323.2.14
*** global.lisp	13 Oct 2003 15:26:26 -0000	1.323.2.13
--- global.lisp	14 Oct 2003 16:36:52 -0000	1.323.2.14
***************
*** 1436,1441 ****
    "Checks if the given frame is shown."
    (declare (ignore variant))
!   (let ((shown? nil))
!     (when-bind (win (get-window frame))
        (setf shown? (and (not (window.disabled? win)) (window.visible? win))))
      ;;(warn "basic frame: ~s" shown?)
--- 1436,1444 ----
    "Checks if the given frame is shown."
    (declare (ignore variant))
!   (let ((shown? nil)
! 	(win nil))
!     (unless (eq frame nil)
!       (setf win (get-window frame)))
!     (when win
        (setf shown? (and (not (window.disabled? win)) (window.visible? win))))
      ;;(warn "basic frame: ~s" shown?)

Index: loop.lisp
===================================================================
RCS file: /cvsroot/langband/langband/loop.lisp,v
retrieving revision 1.277.2.24
retrieving revision 1.277.2.25
diff -C2 -d -r1.277.2.24 -r1.277.2.25
*** loop.lisp	13 Oct 2003 15:45:17 -0000	1.277.2.24
--- loop.lisp	14 Oct 2003 16:36:52 -0000	1.277.2.25
***************
*** 45,50 ****
    (when (not (any-redraws? player)) (return-from redraw-stuff nil))
  
!   (let ((retval nil)
! 	(pr-set nil))
  
      (when (want-redraw? player '[map])
--- 45,49 ----
    (when (not (any-redraws? player)) (return-from redraw-stuff nil))
  
!   (let ((retval nil))
  
      (when (want-redraw? player '[map])
***************
*** 72,79 ****
      (when (want-redraw? player '[misc])
        (reset-redraw! player '[misc])
!       (unless pr-set (setf pr-set (get-setting variant :basic-frame-printing)))
! 
!       (print-field (get-race-name player)  0 (setting-lookup pr-set "race") +charinfo-frame+)
!       (print-field (get-class-name player) 0 (setting-lookup pr-set "class") +charinfo-frame+)
        (setf retval t))
      
--- 71,76 ----
      (when (want-redraw? player '[misc])
        (reset-redraw! player '[misc])
!       (trigger-printfield-hooks& variant dungeon player '[race])
!       (trigger-printfield-hooks& variant dungeon player '[class])
        (setf retval t))
      
***************
*** 81,86 ****
      (when (want-redraw? player '[level])
        (reset-redraw! player '[level])
-       (unless pr-set (setf pr-set (get-setting variant :basic-frame-printing)))
-       (print-level variant player pr-set)
        (trigger-printfield-hooks& variant dungeon player '[level])
        (setf retval t))
--- 78,81 ----
***************
*** 88,93 ****
      (when (want-redraw? player '[xp])
        (reset-redraw! player '[xp])
-       (unless pr-set (setf pr-set (get-setting variant :basic-frame-printing)))
-       (print-xp variant player pr-set)
        (trigger-printfield-hooks& variant dungeon player '[xp])
        (setf retval t))
--- 83,86 ----
***************
*** 95,101 ****
      (when (want-redraw? player '[stats])
        (reset-redraw! player '[stats])
-       (unless pr-set (setf pr-set (get-setting variant :basic-frame-printing)))
-       (dotimes (i (variant.stat-length variant))
- 	(print-stat player pr-set i)) ;; probably not optimal handling
        (trigger-printfield-hooks& variant dungeon player '[stats])
        (setf retval t))
--- 88,91 ----
***************
*** 103,108 ****
      (when (want-redraw? player '[armour])
        (reset-redraw! player '[armour])
-       (unless pr-set (setf pr-set (get-setting variant :basic-frame-printing)))
-       (print-armour-class variant player pr-set)
        (trigger-printfield-hooks& variant dungeon player '[armour])
        (setf retval t))
--- 93,96 ----
***************
*** 110,115 ****
      (when (want-redraw? player '[hp])
        (reset-redraw! player '[hp])
-       (unless pr-set (setf pr-set (get-setting variant :basic-frame-printing)))
-       (print-hit-points variant player pr-set)
        (trigger-printfield-hooks& variant dungeon player '[hp])
        (setf retval t))
--- 98,101 ----
***************
*** 117,122 ****
      (when (want-redraw? player '[gold])
        (reset-redraw! player '[gold])
-       (unless pr-set (setf pr-set (get-setting variant :basic-frame-printing)))
-       (print-gold variant player pr-set)
        (trigger-printfield-hooks& variant dungeon player '[gold])
        (setf retval t))
--- 103,106 ----
***************
*** 146,151 ****
      (when (want-redraw? player '[speed])
        (reset-redraw! player '[speed])
-       (unless pr-set (setf pr-set (get-setting variant :basic-frame-printing)))
-       (print-speed variant player pr-set)
        (trigger-printfield-hooks& variant dungeon player '[speed])
        (setf retval t))
--- 130,133 ----
***************
*** 648,656 ****
  	     (when (basic-frame-shown? var-obj)
  	       (when-bind (win (get-window +charinfo-frame+))
! 		 (refresh-window win)))
  	     
  	     (when (is-frame-shown? var-obj +tiledfields-frame+)
  	       (when-bind (win (get-window +tiledfields-frame+))
! 		 (refresh-window win)))
  
  	     (cond ((> (get-creature-energy front) +energy-normal-action+) ;; he or she can do an action
--- 630,638 ----
  	     (when (basic-frame-shown? var-obj)
  	       (when-bind (win (get-window +charinfo-frame+))
! 		 (refresh-window win +winflag-delay-paint+)))
  	     
  	     (when (is-frame-shown? var-obj +tiledfields-frame+)
  	       (when-bind (win (get-window +tiledfields-frame+))
! 		 (refresh-window win +winflag-delay-paint+)))
  
  	     (cond ((> (get-creature-energy front) +energy-normal-action+) ;; he or she can do an action

Index: print.lisp
===================================================================
RCS file: /cvsroot/langband/langband/print.lisp,v
retrieving revision 1.118.4.5
retrieving revision 1.118.4.6
diff -C2 -d -r1.118.4.5 -r1.118.4.6
*** print.lisp	6 Oct 2003 00:24:07 -0000	1.118.4.5
--- print.lisp	14 Oct 2003 16:36:52 -0000	1.118.4.6
***************
*** 19,27 ****
  (in-package :org.langband.engine)
  
  
  ;; very very inefficient, and wrong.. should use padding
  (defun print-number (term colour number padding row col)
    ;; hack
!   (let ((win (aref *windows* term)))
      ;;(output-string! win col row colour (format nil "~vd" padding number))
      (win/format win col row colour "~v" padding number) ;; padding number))
--- 19,134 ----
  (in-package :org.langband.engine)
  
+ (defstruct (field-printer (:copier nil)
+ 			  (:conc-name field-printer.))
+   key
+   col
+   row
+   window-key
+   handler)
+ 
+ (defvar *printfield-info* (make-hash-table :test #'eq))
+ (defvar *printfield-hooks* (make-hash-table :test #'eq))
+ 
+ (defun define-printfield-handler (key window handler &key hook-on-redraw)
+   (let ((info (gethash key *printfield-info*)))
+     (unless (field-printer-p info)
+       (setf info (make-field-printer :key key)))
+ 
+     (setf (field-printer.handler info) handler
+ 	  (field-printer.window-key info) window)
+     (warn "handling ~s ~s ~s" key window handler)
+     (setf (gethash key *printfield-info*) info)
+ 
+     (when hook-on-redraw
+       (pushnew info (gethash hook-on-redraw *printfield-hooks*)))
+     
+     info))
+ 
+ (defun trigger-printfield-hooks& (variant dungeon player key)
+   "Triggers any registered printfield hooks for given key."
+   (when-bind (triggers (gethash key *printfield-hooks*))
+     ;;(warn "TRIGGERS  ~s" triggers)
+     (assert (consp triggers))
+     (dolist (trigger triggers)
+       (trigger-printfield variant dungeon player trigger))
+     t))
+ 
+ 
+ (defun trigger-printfield (variant dungeon player printfield)
+ 
+   (let ((win (get-window (field-printer.window-key printfield))))
+ 
+     (when (and (is-frame-shown? variant win)
+ 	       (functionp (field-printer.handler printfield))
+ 	       (non-negative-integer? (field-printer.col printfield))
+ 	       (non-negative-integer? (field-printer.row printfield)))
+       
+       ;; call the handler
+       (funcall (field-printer.handler printfield) win
+ 	       (field-printer.col printfield)
+ 	       (field-printer.row printfield)
+ 	       variant player dungeon))))
+ 
+ 
+ ;; hack
+ (defmacro printfield-handler (arguments &body body)
+   (assert (= (length arguments) 6))
+   (let ((def `(lambda ,arguments
+ 	       (declare (ignorable ,@arguments))
+ 	       ,@body)))
+ ;;    (warn "Def is ~s" def)
+     `(function ,def)))
+ 
+ 
+ (defun register-field-order (window order)
+   "Registers the order of fields that need printing for
+ a certain window. <nothing> is a magic constant."
+   (declare (ignorable window))
+   (let ((row-counter 0)
+ 	(col-counter 0))
+ 	
+     (dolist (i order)
+       (let ((the-key nil)
+ 	    (num-rows 1))
+ 	(cond 	      
+ 	      ((consp i)
+ 	       (destructuring-bind (key &key (rows 1)) i
+ 		 (if (or (eq nil key) (eq key '<nothing>))
+ 		     (setf the-key nil
+ 			   row-counter (+ rows row-counter))
+ 		     (setf the-key key
+ 			   num-rows rows))))
+ 	      
+ 	      ((symbolp i)
+ 	       (if (or (eq i nil) (eq i '<nothing>))
+ 		   (setf the-key nil
+ 			   row-counter (+ 1 row-counter))
+ 		   (setf the-key i
+ 			 num-rows 1)))
+ 	      (t
+ 	       (error "Don't know how to treat printfield-order ~s" i)))
+ 	
+ 	(when the-key
+ 	  (let ((info (gethash the-key *printfield-info*)))
+ 	    (unless (field-printer-p info)
+ 	      (setf info (make-field-printer :key the-key)))
+ 	    
+ 	    (assert (non-negative-integer? num-rows))
+ 	    (setf (field-printer.row info) row-counter
+ 		  (field-printer.col info) col-counter)
+ 
+ 	    (warn "row is ~s for ~s" row-counter the-key)
+ 	    (incf row-counter num-rows)
+ 
+ 	    (setf (gethash the-key *printfield-info*) info)
+ 	    ))))
+     
+     *printfield-info*))
+ 
  
  ;; very very inefficient, and wrong.. should use padding
  (defun print-number (term colour number padding row col)
    ;; hack
!   (let ((win (get-window term)))
      ;;(output-string! win col row colour (format nil "~vd" padding number))
      (win/format win col row colour "~v" padding number) ;; padding number))
***************
*** 34,38 ****
  (defun print-stat-value (term colour stat row col)
  
!   (let ((win (aref *windows* term)))
      ;; a bit ugly but we avoid consing
      (cond ((>= stat 118)
--- 141,145 ----
  (defun print-stat-value (term colour stat row col)
  
!   (let ((win (get-window term)))
      ;; a bit ugly but we avoid consing
      (cond ((>= stat 118)
***************
*** 51,216 ****
      t))
  	  
-   
-   #||
-   (output-string! (aref *windows* term)
- 		  col row colour (cond ((>= stat 118)
- 					(format nil "18/~3,'0d" (- stat 18)))
- 				       ((> stat 18)
- 					(format nil " 18/~2,'0d" (- stat 18)))
- 				       (t
- 					(format nil "    ~2d" stat)
- 					)))
-   
- (win/format (aref *windows* term) col row colour "    ~2d" stat))
- ||#
- 
- (defun print-field (str x y term)
-   "Print string at given coordinates in light-blue."
-   ;; clear and then write
- 
-   (with-frame (term)
-     (put-coloured-str! +term-white+ "            " x y)
-     (put-coloured-str! +term-l-blue+ str x y)))
- 
- 
- (defun print-stat (player setting num)
-   "Prints stats in the left frame."
- 
-   (let* ((stat-val (svref (player.active-stats player) num))
- 	 (max-val (svref (player.modbase-stats player) num))
- 	 (reduced-stat-p (> max-val stat-val))
- 	 (row (setting-lookup setting "stat"))
- 	 (col 0)
- 	 (name (get-stat-name-from-num num))
- 	 (term +charinfo-frame+)
- 	 (win (aref *windows* term))
- 	 )
- 
-     ;; maybe add the reduced-stat code later
-     (output-string! win col (+ num row) +term-white+ name)
-     
-     (print-stat-value +charinfo-frame+ (if reduced-stat-p +term-yellow+ +term-l-green+)
- 		      stat-val (+ row num) (+ col 5))
-     
-     ))
- 
- 
- (defun print-level (variant player setting)
-   "Prints level in the left frame."
- 
-   (when (basic-frame-shown? variant)
-     (let* ((lev (player.power-lvl player))
- 	   (row (setting-lookup setting "level"))
- 	   (lower-lvl-p (< lev (player.max-level player))))
-       
-       (output-string! +charinfo-frame+ 0 row +term-white+ "Level")
-       
-       (print-number +charinfo-frame+ (if lower-lvl-p +term-yellow+ +term-l-green+)
- 		    lev 6 row 5)
-       t)))
- 
- (defun print-xp (variant player setting)
-   "Prints xp in the left frame."
- 
-   (when (basic-frame-shown? variant)
-     (let* ((xp (player.current-xp player))
- 	   (row (setting-lookup setting "xp"))
- 	   (lower-xp-p (< xp (player.maximum-xp player))))
-       
-       (output-string! +charinfo-frame+ 0 row +term-white+ "Xp")
-       
-       (print-number +charinfo-frame+ (if lower-xp-p +term-yellow+ +term-l-green+)
- 		    xp 8 row 3)
-       
-       t)))
- 
- 
- (defun print-gold (variant player setting)
-   "Prints gold to left frame."
- 
-   (when (basic-frame-shown? variant)
-     (let ((gold (player.gold player))
- 	  (row (setting-lookup setting "gold")))
-       
-       (output-string! +charinfo-frame+ 0 row +term-white+ "Au")
-       
-       (print-number +charinfo-frame+ +term-l-green+ gold 9 row 2)
-       
-       t)))
- 
- 
- (defmethod print-armour-class ((variant variant) (player player) setting)
-   "Prints AC to left frame."
-   
-   (when (basic-frame-shown? variant)
- 
-     (let* ((perc (player.perceived-abilities player))
- 	   (ac (+ (get-armour-rating perc)
- 		  (get-armour-modifier perc)))
- 	   (row (setting-lookup setting "ac")))
-       
-       (output-string! +charinfo-frame+ 0 row +term-white+ "Armour")
-       
-       (print-number +charinfo-frame+ +term-l-green+
- 		    ac 5 row 6)
-       t)))
- 
- 
- (defmethod print-hit-points (variant player setting)
-   "Prints hit-points info to left frame."
- 
-   (when (basic-frame-shown? variant)
- 
-     (let ((cur-hp (current-hp player))
- 	  (max-hp (maximum-hp player))
- 	  (row (setting-lookup setting "hp"))
- 	  )
-       
-       (output-string! +charinfo-frame+ 0 row +term-white+ "HP")
-       
-       (print-number +charinfo-frame+ (cond ((>= cur-hp max-hp) +term-l-green+)
- 					   ((> cur-hp (int-/ (* max-hp *hitpoint-warning*) 10)) +term-yellow+)
- 					   (t +term-red+))
- 		    cur-hp 5 row 2)
- 
-     #||
-     ;; max
-     (print-number +charinfo-frame+ +term-l-green+
- 		    max-hp
- 		    5
- 		    (car cur-set)
- 		    (+ (cdr cur-set) 7))
-     
-     ;; cur
- 
- 
-     (setf (window-coord (aref *windows* +charinfo-frame+) +foreground+ 8 (car cur-set))
- 	  (text-paint-value +term-l-green+ #\/))
-     ||#
-     
-       (let ((win (aref *windows* +charinfo-frame+))
- 	    (colour +term-l-green+))
- 	(win/format win 7 row colour "/~v" 3 max-hp))
-       )))
- 
- (defmethod print-speed ((variant variant) (player player) setting)
- 
-   (when (basic-frame-shown? variant)
- 
-     (let ((win (get-window +charinfo-frame+))
- 	  (factor (- (player.speed player) +speed-base+))
- 	  (row (setting-lookup setting "speed")))
-       
-       (cond ((= factor 0)
- 	     (output-string! win 0 row +term-white+ "           "))
- 	    (t
- 	     (let ((colour (if (minusp factor) +term-yellow+ +term-l-green+))
- 		   (*winformat-forced-numbersign* t))
- 	       (output-string! win 0 row +term-white+ "Speed")
- 		 (win/format win 8 row colour "~v" 3 factor) 
- 		 )))
-       t)))
- 
- 
  (defmethod print-hunger ((variant variant) (player player) setting)
  
--- 158,161 ----
***************
*** 236,257 ****
      (return-from print-basic-frame nil))
    
!   (let ((pr-set (get-setting variant :basic-frame-printing))
! 	(stat-len (variant.stat-length variant)))
!     
!     (print-field (get-race-name player)  0 (setting-lookup pr-set "race") +charinfo-frame+)
!     (print-field (get-class-name player) 0 (setting-lookup pr-set "class") +charinfo-frame+)
!     
!     (print-level variant player pr-set)
!     (print-xp variant player pr-set) 
!     
!     (dotimes (i stat-len)
!       (print-stat player pr-set i))
!     
!     (print-armour-class variant player pr-set)
!     (print-hit-points variant player pr-set)
! 
!     (print-speed variant player pr-set)
!     
!     (print-gold variant player pr-set))
  
      #||
--- 181,196 ----
      (return-from print-basic-frame nil))
    
!   (trigger-printfield-hooks& variant dungeon player '[race])
!   (trigger-printfield-hooks& variant dungeon player '[class])
!   (trigger-printfield-hooks& variant dungeon player '[level])
!   (trigger-printfield-hooks& variant dungeon player '[stats])
!   (trigger-printfield-hooks& variant dungeon player '[armour])
!   (trigger-printfield-hooks& variant dungeon player '[hp])
!   (trigger-printfield-hooks& variant dungeon player '[gold])
!   (trigger-printfield-hooks& variant dungeon player '[xp])
!   (trigger-printfield-hooks& variant dungeon player '[speed])
!   
!   (print-depth variant *level* nil)
!   t)
  
      #||
***************
*** 271,275 ****
  
    ;; ADD LATER
!   (print-depth variant *level* nil))
  
  
--- 210,214 ----
  
    ;; ADD LATER
! 
  
  

Index: util.lisp
===================================================================
RCS file: /cvsroot/langband/langband/util.lisp,v
retrieving revision 1.123.2.31
retrieving revision 1.123.2.32
diff -C2 -d -r1.123.2.31 -r1.123.2.32
*** util.lisp	13 Oct 2003 15:26:26 -0000	1.123.2.31
--- util.lisp	14 Oct 2003 16:36:52 -0000	1.123.2.32
***************
*** 882,989 ****
        t)))
  
- (defstruct (field-printer (:copier nil)
- 			  (:conc-name field-printer.))
-   key
-   col
-   row
-   window-key
-   handler)
- 
- (defvar *printfield-info* (make-hash-table :test #'eq))
- (defvar *printfield-hooks* (make-hash-table :test #'eq))
- 
- (defun define-printfield-handler (key window handler &key hook-on-redraw)
-   (let ((info (gethash key *printfield-info*)))
-     (unless (field-printer-p info)
-       (setf info (make-field-printer :key key)))
- 
-     (setf (field-printer.handler info) handler
- 	  (field-printer.window-key info) window)
-     (warn "handling ~s ~s ~s" key window handler)
-     (setf (gethash key *printfield-info*) info)
- 
-     (when hook-on-redraw
-       (pushnew info (gethash hook-on-redraw *printfield-hooks*)))
-     
-     info))
- 
- (defun trigger-printfield-hooks& (variant dungeon player key)
-   "Triggers any registered printfield hooks for given key."
-   (when-bind (triggers (gethash key *printfield-hooks*))
-     ;;(warn "TRIGGERS  ~s" triggers)
-     (assert (consp triggers))
-     (dolist (trigger triggers)
-       (trigger-printfield variant dungeon player trigger))
-     t))
- 
- 
- (defun trigger-printfield (variant dungeon player printfield)
- 
-   (let ((win (get-window (field-printer.window-key printfield))))
- 
-     (when (and (is-frame-shown? variant win)
- 	       (functionp (field-printer.handler printfield))
- 	       (non-negative-integer? (field-printer.col printfield))
- 	       (non-negative-integer? (field-printer.row printfield)))
-       
-       ;; call the handler
-       (funcall (field-printer.handler printfield) win
- 	       (field-printer.col printfield)
- 	       (field-printer.row printfield)
- 	       variant player *dungeon*))))
- 
- 
- ;; hack
- (defmacro printfield-handler (arguments &body body)
-   (assert (= (length arguments) 6))
-   (let ((def `(lambda ,arguments
- 	       (declare (ignorable ,@arguments))
- 	       ,@body)))
- ;;    (warn "Def is ~s" def)
-     `(function ,def)))
- 
- 
- (defun register-printfield-order (order)
-   "Registers the order of fields that need printing. <nothing> is a
- magic constant."
-   (let ((row-counter 0)
- 	(col-counter 0))
- 	
-     (dolist (i order)
-       (let ((the-key nil)
- 	    (num-rows 1))
- 	(cond 	      
- 	      ((consp i)
- 	       (destructuring-bind (key &key (rows 1)) i
- 		 (if (or (eq nil key) (eq key '<nothing>))
- 		     (setf the-key nil
- 			   row-counter (+ rows row-counter))
- 		     (setf the-key key
- 			   num-rows rows))))
- 	      
- 	      ((symbolp i)
- 	       (if (or (eq i nil) (eq i '<nothing>))
- 		   (setf the-key nil
- 			   row-counter (+ 1 row-counter))
- 		   (setf the-key i
- 			 num-rows 1)))
- 	      (t
- 	       (error "Don't know how to treat printfield-order ~s" i)))
- 	
- 	(when the-key
- 	  (let ((info (gethash the-key *printfield-info*)))
- 	    (unless (field-printer-p info)
- 	      (setf info (make-field-printer :key the-key)))
- 	    
- 	    (assert (non-negative-integer? num-rows))
- 	    (setf (field-printer.row info) row-counter
- 		  (field-printer.col info) col-counter)
- 	    
- 	    (incf row-counter num-rows)
- 
- 	    (setf (gethash the-key *printfield-info*) info)
- 	    ))))
-     
-     *printfield-info*))
  
  (defun colour-area (win colour-idx col row wid hgt)
--- 882,885 ----
***************
*** 1009,1026 ****
    
    (when (is-frame-shown? variant +tiledfields-frame+)
  
-     (let (;;(stat-len (variant.stat-length variant))
- 	  (win (get-window +tiledfields-frame+)))
-       (colour-window win 0)
-       (loop for x being the hash-values of *printfield-info*
- 	    do
- 	    (progn
- 	      ;;(format t "~&~s ~a ~a~%" (button-info-key x) (button-info-col x) (button-info-row x))
- 	      (when (and (functionp (field-printer.handler x))
- 			 (non-negative-integer? (field-printer.col x))
- 			 (non-negative-integer? (field-printer.row x)))
- 		(funcall (field-printer.handler x) win (field-printer.col x) (field-printer.row x)
- 			 variant player *dungeon*))
- 	      ))
        
  
--- 905,927 ----
    
    (when (is-frame-shown? variant +tiledfields-frame+)
+     (let ((win (get-window +tiledfields-frame+)))
+       (colour-window win 0)))
+ 
+   
+   (loop for x being the hash-values of *printfield-info*
+ 	do
+ 	(when (is-frame-shown? variant (field-printer.window-key x))
+ 	  ;;(format t "~&~s ~a ~a~%" (button-info-key x) (button-info-col x) (button-info-row x))
+ 	  (when (and (functionp (field-printer.handler x))
+ 		     (non-negative-integer? (field-printer.col x))
+ 		     (non-negative-integer? (field-printer.row x)))
+ 	      (funcall (field-printer.handler x) (get-window (field-printer.window-key x))
+ 		       (field-printer.col x) (field-printer.row x)
+ 		       variant player *dungeon*)
+ 	      )))
+ 
+   (refresh-window +tiledfields-frame+)
+   (refresh-window +charinfo-frame+))
  
        
  
***************
*** 1088,1094 ****
        
        ;;(setf (window-coord win +foreground+ 0 row) 0) ;;(tile-paint-value 10 10))
!       (refresh-window win)
!       
!     )))
  
  (defmethod switch-inventory-view (variant player &key wanted-view)
--- 989,993 ----
        
        ;;(setf (window-coord win +foreground+ 0 row) 0) ;;(tile-paint-value 10 10))
! 
  
  (defmethod switch-inventory-view (variant player &key wanted-view)

Index: package.lisp
===================================================================
RCS file: /cvsroot/langband/langband/package.lisp,v
retrieving revision 1.109.2.13
retrieving revision 1.109.2.14
diff -C2 -d -r1.109.2.13 -r1.109.2.14
*** package.lisp	13 Oct 2003 15:26:26 -0000	1.109.2.13
--- package.lisp	14 Oct 2003 16:36:52 -0000	1.109.2.14
***************
*** 48,52 ****
  	   #:*windows*
  	   #:*winformat-padchar*
! 
  
  	   ;; classes/structs types
--- 48,52 ----
  	   #:*windows*
  	   #:*winformat-padchar*
! 	   #:*winformat-forced-numbersign*
  
  	   ;; classes/structs types
***************
*** 368,371 ****
--- 368,372 ----
  	   #:floor.name
  	   #:floor.numeric-id
+ 	   #:flush-coords
  	   #:flush-messages!
  	   #:flush-window
***************
*** 386,389 ****
--- 387,391 ----
  	   #:get-attribute-value
  	   #:get-character-picture
+ 	   #:get-class-name
  	   #:get-class-tile
  	   #:get-coord-trigger
***************
*** 440,443 ****
--- 442,446 ----
  	   #:get-power-of-attack
  	   #:get-price
+ 	   #:get-race-name
  	   #:get-ranged-attack-skill
  	   #:get-resistance-table ;; returns table
***************
*** 681,685 ****
--- 684,690 ----
  	   #:player.leaving?
  	   #:player.max-depth
+ 	   #:player.max-level
  	   #:player.maximum-xp
+ 	   #:player.modbase-stats
  	   #:player.monster-knowledge
  	   #:player.name
***************
*** 699,707 ****
  	   #:positive-integer?
  	   #:possible-identify!
- 	   #:print-armour-class
  	   #:print-basic-frame
  	   #:print-depth
  	   #:print-extra-frame-content
- 	   #:print-hit-points
  	   #:print-hunger
  	   #:print-map
--- 704,710 ----
***************
*** 711,715 ****
  	   #:print-number
  	   #:print-resistance-table
! 	   #:print-speed
  	   #:print-text!
  	   #:print-tomb
--- 714,718 ----
  	   #:print-number
  	   #:print-resistance-table
! 	   #:print-stat-value
  	   #:print-text!
  	   #:print-tomb
***************
*** 757,765 ****
  	   #:regenerate-hp!
  	   #:register-event&
  	   #:register-help-topic&
  	   #:register-information&
  	   #:register-level!
  	   #:register-level-builder!
- 	   #:register-printfield-order
  	   #:register-slot-order&
  	   #:register-variant&
--- 760,768 ----
  	   #:regenerate-hp!
  	   #:register-event&
+ 	   #:register-field-order
  	   #:register-help-topic&
  	   #:register-information&
  	   #:register-level!
  	   #:register-level-builder!
  	   #:register-slot-order&
  	   #:register-variant&
***************
*** 827,830 ****
--- 830,835 ----
  	   #:tile-paint-value
  	   #:trap-effect
+ 	   #:trigger-printfield
+ 	   #:trigger-printfield-hooks&
  	   #:trigger-special-ability
  	   #:trigger-visual-event
***************
*** 963,966 ****
--- 968,987 ----
  	   #:<unique>
  
+ 	   ;; printfield names
+ 	   #:-basic/race-
+ 	   #:-basic/class-
+ 	   #:-basic/level-
+ 	   #:-basic/xp-
+ 	   #:-basic/gold-
+ 	   #:-basic/stats-
+ 	   #:-basic/armour-
+ 	   #:-basic/hitpoints-
+ 	   #:-basic/speed-
+ 	   #:-basic/hunger-
+ 	   #:-tiled/stats-
+ 	   #:-tiled/level-
+ 	   #:-tiled/armour-
+ 	   #:-tiled/hitpoints-
+ 	   
  	   #:*visevents*
  	   #:visual-event