[langband-cvs] CVS: langband/variants/vanilla wizard.lisp,1.54,1.55 various.lisp,1.176,1.177 spells.lisp,1.122,1.123 print.lisp,1.45,1.46 player.lisp,1.52,1.53 objects.lisp,1.60,1.61 levels.lisp,1.58,1.59 keys.lisp,1.109,1.110 effects.lisp,1.33,1.34 constants.lisp,1.8,1.9 combat.lisp,1.25,1.26

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

Update of /cvsroot/langband/langband/variants/vanilla
In directory sc8-pr-cvs1:/tmp/cvs-serv32693/variants/vanilla

Modified Files:
	wizard.lisp various.lisp spells.lisp print.lisp player.lisp 
	objects.lisp levels.lisp keys.lisp effects.lisp constants.lisp 
	combat.lisp 
Log Message:
changed redraw system from bitfields to generic symbols that are more easily extended

Index: wizard.lisp
===================================================================
RCS file: /cvsroot/langband/langband/variants/vanilla/wizard.lisp,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** wizard.lisp	18 Jun 2003 22:51:02 -0000	1.54
--- wizard.lisp	27 Jul 2003 13:52:40 -0000	1.55
***************
*** 127,131 ****
  	  (when (and (integerp amount) (plusp amount))
  	    (setf (player.gold player) amount)
! 	    (bit-flag-add! *redraw* +print-gold+))
  	  )))
  
--- 127,131 ----
  	  (when (and (integerp amount) (plusp amount))
  	    (setf (player.gold player) amount)
! 	    (ask-for-redraw! player '[gold]))
  	  )))
  
***************
*** 379,383 ****
  	(declare (ignore dungeon))
  	(setf (current-hp player) (maximum-hp player))
! 	(bit-flag-add! *redraw* +print-hp+)
  	))
  (define-key-operation 'load-vanilla
--- 379,383 ----
  	(declare (ignore dungeon))
  	(setf (current-hp player) (maximum-hp player))
! 	(ask-for-redraw! player '[hp])
  	))
  (define-key-operation 'load-vanilla

Index: various.lisp
===================================================================
RCS file: /cvsroot/langband/langband/variants/vanilla/various.lisp,v
retrieving revision 1.176
retrieving revision 1.177
diff -C2 -d -r1.176 -r1.177
*** various.lisp	26 Jun 2003 11:14:50 -0000	1.176
--- various.lisp	27 Jul 2003 13:52:40 -0000	1.177
***************
*** 738,742 ****
  	  
  	  (item-table-add! the-table removed-obj) ;; put back
! 	  (bit-flag-add! *redraw* +print-equip+)	  
  	  )))
      nil))
--- 738,742 ----
  	  
  	  (item-table-add! the-table removed-obj) ;; put back
! 	  (ask-for-redraw! player '[equipment])
  	  )))
      nil))

Index: spells.lisp
===================================================================
RCS file: /cvsroot/langband/langband/variants/vanilla/spells.lisp,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -d -r1.122 -r1.123
*** spells.lisp	19 Jun 2003 12:17:45 -0000	1.122
--- spells.lisp	27 Jul 2003 13:52:40 -0000	1.123
***************
*** 88,92 ****
      
      (when (/= old-mana new-mana)
!       (bit-flag-add! *redraw* +print-mana+))
      
      t))
--- 88,92 ----
      
      (when (/= old-mana new-mana)
!       (ask-for-redraw! player '[mana]))
      
      t))
***************
*** 352,357 ****
        (light-spot! dungeon (car i) (cdr i)))
      
-     ;;(bit-flag-add! *redraw* +print-map+)
-     
      t))
  
--- 352,355 ----
***************
*** 464,468 ****
  	     (vector-push-extend spell-id learnt-spells)
  	     (format-message! "~a learnt." (spell.name spell))
! 	     (bit-flag-add! *redraw* +print-study+)
  	     (return-from learn-spell! t))
  	    
--- 462,466 ----
  	     (vector-push-extend spell-id learnt-spells)
  	     (format-message! "~a learnt." (spell.name spell))
! 	     (ask-for-redraw! player '[study])
  	     (return-from learn-spell! t))
  	    
***************
*** 627,631 ****
  		   ;; deduct mana, better way?
  		   (decf (current-mana player) (spell.mana spell-data))
! 		   (bit-flag-add! *redraw* +print-mana+)
  		   (unless (spell.tried spell-data)
  		     ;;(warn "Tried spell ~s" (spell.id spell-data))
--- 625,629 ----
  		   ;; deduct mana, better way?
  		   (decf (current-mana player) (spell.mana spell-data))
! 		   (ask-for-redraw! player '[mana])
  		   (unless (spell.tried spell-data)
  		     ;;(warn "Tried spell ~s" (spell.id spell-data))

Index: print.lisp
===================================================================
RCS file: /cvsroot/langband/langband/variants/vanilla/print.lisp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** print.lisp	3 Jun 2003 11:06:46 -0000	1.45
--- print.lisp	27 Jul 2003 13:52:40 -0000	1.46
***************
*** 86,90 ****
  (defmethod redraw-stuff ((variant vanilla-variant) (dungeon dungeon) (player player))
    
!   (when (= 0 *redraw*) (return-from redraw-stuff nil))
  
    (let ((retval nil)
--- 86,90 ----
  (defmethod redraw-stuff ((variant vanilla-variant) (dungeon dungeon) (player player))
    
!   (unless (any-redraws? player) (return-from redraw-stuff nil))
  
    (let ((retval nil)
***************
*** 92,108 ****
  	)
  
!     (when (bit-flag-set? *redraw* +print-extra+)
!       (bit-flag-remove! *redraw* +print-extra+)
!       (bit-flag-remove! *redraw* +print-cut+)
!       (bit-flag-remove! *redraw* +print-stun+)
!       (bit-flag-remove! *redraw* +print-hunger+)
!       (bit-flag-remove! *redraw* +print-blind+)
!       (bit-flag-remove! *redraw* +print-confused+)
!       (bit-flag-remove! *redraw* +print-afraid+)
!       (bit-flag-remove! *redraw* +print-poisoned+)
!       (bit-flag-remove! *redraw* +print-paralysis+)
!       (bit-flag-remove! *redraw* +print-speed+)
!       (bit-flag-remove! *redraw* +print-study+)
! ;;      (unless pr-set (setf pr-set (get-setting variant :basic-frame-printing)))
  
        (print-extra-frame-content variant dungeon player)
--- 92,107 ----
  	)
  
!     (when (want-redraw? player '[extra])
!       (reset-redraw! player '[extra])
!       (reset-redraw! player '[cut])
!       (reset-redraw! player '[stun])
!       (reset-redraw! player '[satiation])
!       (reset-redraw! player '[blind])
!       (reset-redraw! player '[confused])
!       (reset-redraw! player '[afraid])
!       (reset-redraw! player '[poisoned])
!       (reset-redraw! player '[paralysis])
!       (reset-redraw! player '[speed])
!       (reset-redraw! player '[study])
  
        (print-extra-frame-content variant dungeon player)
***************
*** 110,144 ****
  
      
!     (when (bit-flag-set? *redraw* +print-cut+)
!       (bit-flag-remove! *redraw* +print-cut+)
        (unless pr-set (setf pr-set (get-setting variant :basic-frame-printing)))
        (print-cut variant player pr-set)
        (setf retval t))
  
!     (when (bit-flag-set? *redraw* +print-stun+)
!       (bit-flag-remove! *redraw* +print-stun+)
        (unless pr-set (setf pr-set (get-setting variant :basic-frame-printing)))
        (print-stun variant player pr-set)
        (setf retval t))
  
!     (when (bit-flag-set? *redraw* +print-hunger+)
!       (bit-flag-remove! *redraw* +print-hunger+)
        (unless pr-set (setf pr-set (get-setting variant :basic-frame-printing)))
        (print-hunger variant player pr-set)
        (setf retval t))
  
!     (when (bit-flag-set? *redraw* +print-blind+)
!       (bit-flag-remove! *redraw* +print-blind+)
        (modify-visual-state! variant :blind (get-attribute-value '<blindness> (player.temp-attrs player)))
        (setf retval t))
  
!     (when (bit-flag-set? *redraw* +print-confused+)
!       (bit-flag-remove! *redraw* +print-confused+)
        (modify-visual-state! variant :confused
  			    (get-attribute-value '<confusion> (player.temp-attrs player)))
        (setf retval t))
  
!     (when (bit-flag-set? *redraw* +print-afraid+)
!       (bit-flag-remove! *redraw* +print-afraid+)
        (modify-visual-state! variant :afraid
  			    (get-attribute-value '<fear> (player.temp-attrs player)))
--- 109,143 ----
  
      
!     (when (want-redraw? player '[cut])
!       (reset-redraw! player '[cut])
        (unless pr-set (setf pr-set (get-setting variant :basic-frame-printing)))
        (print-cut variant player pr-set)
        (setf retval t))
  
!     (when (want-redraw? player '[stun])
!       (reset-redraw! player '[stun])
        (unless pr-set (setf pr-set (get-setting variant :basic-frame-printing)))
        (print-stun variant player pr-set)
        (setf retval t))
  
!     (when (want-redraw? player '[satiation])
!       (reset-redraw! player '[satiation])
        (unless pr-set (setf pr-set (get-setting variant :basic-frame-printing)))
        (print-hunger variant player pr-set)
        (setf retval t))
  
!     (when (want-redraw? player '[blind])
!       (reset-redraw! player '[blind])
        (modify-visual-state! variant :blind (get-attribute-value '<blindness> (player.temp-attrs player)))
        (setf retval t))
  
!     (when (want-redraw? player '[confused])
!       (reset-redraw! player '[confused])
        (modify-visual-state! variant :confused
  			    (get-attribute-value '<confusion> (player.temp-attrs player)))
        (setf retval t))
  
!     (when (want-redraw? player '[afraid])
!       (reset-redraw! player '[afraid])
        (modify-visual-state! variant :afraid
  			    (get-attribute-value '<fear> (player.temp-attrs player)))
***************
*** 146,157 ****
      
  
!     (when (bit-flag-set? *redraw* +print-poisoned+)
!       (bit-flag-remove! *redraw* +print-poisoned+)
        (modify-visual-state! variant :poisoned (get-attribute-value '<poisoned> (player.temp-attrs player)))
        (setf retval t))
  
  
!     (when (bit-flag-set? *redraw* +print-paralysis+)
!       (bit-flag-remove! *redraw* +print-paralysis+)
        (modify-visual-state! variant :paralysed (get-attribute-value '<paralysed> (player.temp-attrs player)))
        (setf retval t))
--- 145,156 ----
      
  
!     (when (want-redraw? player '[poisoned])
!       (reset-redraw! player '[poisoned])
        (modify-visual-state! variant :poisoned (get-attribute-value '<poisoned> (player.temp-attrs player)))
        (setf retval t))
  
  
!     (when (want-redraw? player '[paralysis])
!       (reset-redraw! player '[paralysis])
        (modify-visual-state! variant :paralysed (get-attribute-value '<paralysed> (player.temp-attrs player)))
        (setf retval t))
***************
*** 159,169 ****
      ;; speed in engine
  
!     (when (bit-flag-set? *redraw* +print-study+)
!       (bit-flag-remove! *redraw* +print-study+)
        (modify-visual-state! variant :can-study (can-learn-more-spells? variant player))
        (setf retval t))
  
!     (when (bit-flag-set? *redraw* +print-mana+)
!       (bit-flag-remove! *redraw* +print-mana+)
        (unless pr-set (setf pr-set (get-setting variant :basic-frame-printing)))
        (print-mana-points variant player pr-set)
--- 158,168 ----
      ;; speed in engine
  
!     (when (want-redraw? player '[study])
!       (reset-redraw! player '[study])
        (modify-visual-state! variant :can-study (can-learn-more-spells? variant player))
        (setf retval t))
  
!     (when (want-redraw? player '[mana])
!       (reset-redraw! player '[mana])
        (unless pr-set (setf pr-set (get-setting variant :basic-frame-printing)))
        (print-mana-points variant player pr-set)
***************
*** 209,213 ****
      (print-mana-points variant player pr-set)
      
!     (bit-flag-remove! *redraw* +print-mana+)
  
      t))
--- 208,212 ----
      (print-mana-points variant player pr-set)
      
!     (reset-redraw! player '[mana])
  
      t))

Index: player.lisp
===================================================================
RCS file: /cvsroot/langband/langband/variants/vanilla/player.lisp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** player.lisp	19 Jun 2003 01:06:26 -0000	1.52
--- player.lisp	27 Jul 2003 13:52:40 -0000	1.53
***************
*** 369,374 ****
  	  
  	  (ecase state
! 	    (<cut> (bit-flag-add! *redraw* +print-cut+))
! 	    (<stun> (bit-flag-add! *redraw* +print-stun+)))
  	  
  	  ;; skip handle-stuff
--- 369,374 ----
  	  
  	  (ecase state
! 	    (<cut> (ask-for-redraw! creature '[cut]))
! 	    (<stun> (ask-for-redraw! creature '[stun])))
  	  
  	  ;; skip handle-stuff
***************
*** 527,534 ****
  			 :update-fun #'%modify-boolean-effect
  			 :on-update #'(lambda (player attr)
! 					(declare (ignore player attr))
  					(bit-flag-add! *update* +pl-upd-forget-view+ +pl-upd-update-view+ 
                                                         +pl-upd-monsters+)
! 					(bit-flag-add! *redraw* +print-map+ +print-blind+)
  					;; skip window
  					)			 
--- 527,535 ----
  			 :update-fun #'%modify-boolean-effect
  			 :on-update #'(lambda (player attr)
! 					(declare (ignore attr))
  					(bit-flag-add! *update* +pl-upd-forget-view+ +pl-upd-update-view+ 
                                                         +pl-upd-monsters+)
! 					(ask-for-redraw! player '[map])
! 					(ask-for-redraw! player '[blind])
  					;; skip window
  					)			 
***************
*** 541,546 ****
  			 :update-fun #'%modify-boolean-effect
  			 :on-update #'(lambda (player attr)
! 					(declare (ignore player attr))
! 					(bit-flag-add! *redraw* +print-paralysis+))
  			 :desc "boolean, either paralysed or not")
  
--- 542,547 ----
  			 :update-fun #'%modify-boolean-effect
  			 :on-update #'(lambda (player attr)
! 					(declare (ignore attr))
! 					(ask-for-redraw! player '[paralysis]))
  			 :desc "boolean, either paralysed or not")
  
***************
*** 551,556 ****
  			 :update-fun #'%modify-boolean-effect
  			 :on-update #'(lambda (player attr)
! 					(declare (ignore player attr))
! 					(bit-flag-add! *redraw* +print-confused+))
  			 :desc "boolean, either confused or not")
  
--- 552,557 ----
  			 :update-fun #'%modify-boolean-effect
  			 :on-update #'(lambda (player attr)
! 					(declare (ignore attr))
! 					(ask-for-redraw! player '[confused]))
  			 :desc "boolean, either confused or not")
  
***************
*** 561,566 ****
  			 :update-fun #'%modify-boolean-effect
  			 :on-update #'(lambda (player attr)
! 					(declare (ignore player attr))
! 					(bit-flag-add! *redraw* +print-afraid+))
  			 :desc "boolean, either afraid or not")
        
--- 562,567 ----
  			 :update-fun #'%modify-boolean-effect
  			 :on-update #'(lambda (player attr)
! 					(declare (ignore attr))
! 					(ask-for-redraw! player '[afraid]))
  			 :desc "boolean, either afraid or not")
        
***************
*** 571,576 ****
  			 :update-fun #'%modify-boolean-effect
  			 :on-update #'(lambda (player attr)
! 					(declare (ignore player attr))
! 					(bit-flag-add! *redraw* +print-map+))
  			 :desc "boolean, either hallucinating or not")
  
--- 572,577 ----
  			 :update-fun #'%modify-boolean-effect
  			 :on-update #'(lambda (player attr)
! 					(declare (ignore attr))
! 					(ask-for-redraw! player '[map]))
  			 :desc "boolean, either hallucinating or not")
  
***************
*** 581,586 ****
  			 :update-fun #'%modify-boolean-effect
  			 :on-update #'(lambda (player attr)
! 					(declare (ignore player attr))
! 					(bit-flag-add! *redraw* +print-poisoned+))
  			 :desc "boolean, in vanilla you're poisoned or not poisoned")
  
--- 582,587 ----
  			 :update-fun #'%modify-boolean-effect
  			 :on-update #'(lambda (player attr)
! 					(declare (ignore attr))
! 					(ask-for-redraw! player '[poisoned]))
  			 :desc "boolean, in vanilla you're poisoned or not poisoned")
  
***************
*** 1209,1213 ****
  (defmethod gain-power-level! ((variant vanilla-variant) player)
  
!   (bit-flag-add! *redraw* +print-study+)
    (bit-flag-add! *update* +pl-upd-mana+ +pl-upd-spells+)
    (call-next-method variant player))
--- 1210,1214 ----
  (defmethod gain-power-level! ((variant vanilla-variant) player)
  
!   (ask-for-redraw! player '[study])
    (bit-flag-add! *update* +pl-upd-mana+ +pl-upd-spells+)
    (call-next-method variant player))
***************
*** 1245,1249 ****
      (when (/= old-mana (current-mana crt))
  ;;      (warn "Regenerated..")
!       (bit-flag-add! *redraw* +print-mana+))
        
      (current-mana crt)))
--- 1246,1250 ----
      (when (/= old-mana (current-mana crt))
  ;;      (warn "Regenerated..")
!       (ask-for-redraw! crt '[mana]))
        
      (current-mana crt)))

Index: objects.lisp
===================================================================
RCS file: /cvsroot/langband/langband/variants/vanilla/objects.lisp,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** objects.lisp	27 Jun 2003 08:09:53 -0000	1.60
--- objects.lisp	27 Jul 2003 13:52:40 -0000	1.61
***************
*** 791,805 ****
  
        (cond ((eq retval :used)
! 	     (bit-flag-add! *redraw* +print-equip+) ;;possibly used up, time to updated equip display
  	     (incf (player.energy-use player) (effect-entry-energy-use the-effect)))
  	    ((eq retval :still-useful)
  	     (cond ((typep the-object 'active-object/rod)
  		    (setf (aobj.recharge-time the-object) (object.recharge-time (aobj.kind the-object)))
! 		    (bit-flag-add! *redraw* +print-equip+) ;; probable reason for redrawing equipment
  		    )
  		   
  		   ((or (typep the-object 'active-object/wand)
  			(typep the-object 'active-object/staff))
! 		    (bit-flag-add! *redraw* +print-equip+) ;; probable reason for redrawing equipment
  		    (decf (aobj.charges the-object))))
  	     
--- 791,805 ----
  
        (cond ((eq retval :used)
! 	     (ask-for-redraw! player '[equipment]) ;;possibly used up, time to updated equip display
  	     (incf (player.energy-use player) (effect-entry-energy-use the-effect)))
  	    ((eq retval :still-useful)
  	     (cond ((typep the-object 'active-object/rod)
  		    (setf (aobj.recharge-time the-object) (object.recharge-time (aobj.kind the-object)))
! 		    (ask-for-redraw! player '[equipment]) ;; probable reason for redrawing equipment
  		    )
  		   
  		   ((or (typep the-object 'active-object/wand)
  			(typep the-object 'active-object/staff))
! 		    (ask-for-redraw! player '[equipment]) ;; probable reason for redrawing equipment
  		    (decf (aobj.charges the-object))))
  	     

Index: levels.lisp
===================================================================
RCS file: /cvsroot/langband/langband/variants/vanilla/levels.lisp,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** levels.lisp	25 Jun 2003 12:53:01 -0000	1.58
--- levels.lisp	27 Jul 2003 13:52:40 -0000	1.59
***************
*** 330,358 ****
  (defun van/town-illuminate! (dungeon player time-of-day)
    "Illuminates the town according to the time-of-day."
-   (declare (ignore player))
    
!     (with-dungeon (dungeon (coord x y))
!       (declare (ignore x y))
!       (let* ((feat (coord.floor coord))
! 	     (flags (floor.flags feat)))
  	     
! 	;; slightly interesting grids
! 	(cond ((not (bit-flag-set? flags +floor-flag-floor+)) ;; non floors actually
! 	       (bit-flag-add! (coord.flags coord) #.(logior +cave-glow+ +cave-mark+)))
! 	      ;; day-time
! 	      ((eq time-of-day 'day)
! 	       (bit-flag-add! (coord.flags coord) +cave-glow+))
! 	      ;; at night
! 	      (t
! 	       (bit-flag-remove! (coord.flags coord) +cave-glow+))
! 	      ))
!       ;; skip doorways yet
!       )
! 
!     (bit-flag-add! *update* +pl-upd-forget-view+ +pl-upd-update-view+)
!     (bit-flag-add! *redraw* +print-map+)
  
  
-   )
  
  (defmethod generate-level! ((variant vanilla-variant) (level random-level) player)
--- 330,355 ----
  (defun van/town-illuminate! (dungeon player time-of-day)
    "Illuminates the town according to the time-of-day."
    
!   (with-dungeon (dungeon (coord x y))
!     (declare (ignore x y))
!     (let* ((feat (coord.floor coord))
! 	   (flags (floor.flags feat)))
  	     
!       ;; slightly interesting grids
!       (cond ((not (bit-flag-set? flags +floor-flag-floor+)) ;; non floors actually
! 	     (bit-flag-add! (coord.flags coord) #.(logior +cave-glow+ +cave-mark+)))
! 	    ;; day-time
! 	    ((eq time-of-day 'day)
! 	     (bit-flag-add! (coord.flags coord) +cave-glow+))
! 	    ;; at night
! 	    (t
! 	     (bit-flag-remove! (coord.flags coord) +cave-glow+))
! 	    ))
!     ;; skip doorways yet
!     )
  
+   (bit-flag-add! *update* +pl-upd-forget-view+ +pl-upd-update-view+)
+   (ask-for-redraw! player '[map]))
  
  
  (defmethod generate-level! ((variant vanilla-variant) (level random-level) player)

Index: keys.lisp
===================================================================
RCS file: /cvsroot/langband/langband/variants/vanilla/keys.lisp,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** keys.lisp	19 May 2003 15:42:23 -0000	1.109
--- keys.lisp	27 Jul 2003 13:52:40 -0000	1.110
***************
*** 405,413 ****
  					  +pl-upd-update-view+ 
  					  +pl-upd-monsters+))
! 	(bit-flag-add! *redraw* #.(logior +print-extra+
! 					  +print-basic+
! 					  +print-map+
! 					  ;; skip equippy
! 					  ))
  	;; fix clear in the right areas!
  	;; do clear
--- 405,413 ----
  					  +pl-upd-update-view+ 
  					  +pl-upd-monsters+))
! 	(ask-for-redraw! player '[extra])
! 	(ask-for-redraw! player '[basic])
! 	(ask-for-redraw! player '[map])
! 	;; skip equippy
! 	
  	;; fix clear in the right areas!
  	;; do clear

Index: effects.lisp
===================================================================
RCS file: /cvsroot/langband/langband/variants/vanilla/effects.lisp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** effects.lisp	12 Jun 2003 12:03:11 -0000	1.33
--- effects.lisp	27 Jul 2003 13:52:40 -0000	1.34
***************
*** 400,404 ****
  	  ;;(warn "Shrink claims there are now ~s objs"  (items.cur-size container))
  	  (assert (= cur-size (items.cur-size container)))
! 	  (bit-flag-add! *redraw* +print-equip+)
  	  )
  
--- 400,404 ----
  	  ;;(warn "Shrink claims there are now ~s objs"  (items.cur-size container))
  	  (assert (= cur-size (items.cur-size container)))
! 	  (ask-for-redraw! target '[equipment])
  	  )
  

Index: constants.lisp
===================================================================
RCS file: /cvsroot/langband/langband/variants/vanilla/constants.lisp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** constants.lisp	3 May 2003 17:08:20 -0000	1.8
--- constants.lisp	27 Jul 2003 13:52:40 -0000	1.9
***************
*** 17,21 ****
  ;;; === flags that control print/redraw
  
! 
  (defconstant +print-stun+      #x00010000)
  (defconstant +print-confused+  #x00020000)
--- 17,21 ----
  ;;; === flags that control print/redraw
  
! #||
  (defconstant +print-stun+      #x00010000)
  (defconstant +print-confused+  #x00020000)
***************
*** 27,31 ****
--- 27,40 ----
  (defconstant +print-paralysis+ #x00400000)
  (defconstant +print-mana+      #x00800000)
+ ||#
  
+ (define-redraw-key [stun] "...")
+ (define-redraw-key [confused] "...")
+ (define-redraw-key [afraid] "...")
+ (define-redraw-key [poisoned] "...")
+ (define-redraw-key [cut] "...")
+ (define-redraw-key [study] "...")
+ (define-redraw-key [paralysis] "...")
+ (define-redraw-key [mana] "...")
  
  (defconstant +pl-upd-mana+           #x00000020)

Index: combat.lisp
===================================================================
RCS file: /cvsroot/langband/langband/variants/vanilla/combat.lisp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** combat.lisp	25 Jun 2003 15:19:14 -0000	1.25
--- combat.lisp	27 Jul 2003 13:52:40 -0000	1.26
***************
*** 47,51 ****
      (decf (current-hp target) damage)
  
!     (bit-flag-add! *redraw* +print-hp+)
      
      (when (minusp (current-hp target))
--- 47,51 ----
      (decf (current-hp target) damage)
  
!     (ask-for-redraw! target '[hp])
      
      (when (minusp (current-hp target))