[contraband-cvs] CVS: contraband variant.lisp,1.15,1.16 levels.lisp,1.10,1.11 keys.lisp,1.8,1.9

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

Update of /cvsroot/contraband/contraband
In directory sc8-pr-cvs1:/tmp/cvs-serv425/variants/contraband

Modified Files:
	variant.lisp levels.lisp keys.lisp 
Log Message:
changed redraw system from bitfields to generic symbols that are more easily extended

Index: variant.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/variant.lisp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** variant.lisp	1 May 2003 22:23:19 -0000	1.15
--- variant.lisp	27 Jul 2003 13:52:55 -0000	1.16
***************
*** 169,178 ****
  (defmethod redraw-stuff ((variant contraband) (dungeon dungeon) (player player))
    
!   (when (= 0 *redraw*) (return-from redraw-stuff nil))
  
    (let ((retval nil))
  
!     (when (bit-flag-set? *redraw* +print-extra+)
!       (bit-flag-remove! *redraw* +print-extra+)
        (setf retval t))
      
--- 169,178 ----
  (defmethod redraw-stuff ((variant contraband) (dungeon dungeon) (player player))
    
!   (unless (any-redraws? player) (return-from redraw-stuff nil))
  
    (let ((retval nil))
  
!     (when (want-redraw? player '[extra])
!       (reset-redraw! player '[extra])
        (setf retval t))
      

Index: levels.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/levels.lisp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** levels.lisp	20 Apr 2003 12:35:45 -0000	1.10
--- levels.lisp	27 Jul 2003 13:52:55 -0000	1.11
***************
*** 174,178 ****
  
      (bit-flag-add! *update* +pl-upd-forget-view+ +pl-upd-update-view+)
!     (bit-flag-add! *redraw* +print-map+)
  
  
--- 174,178 ----
  
      (bit-flag-add! *update* +pl-upd-forget-view+ +pl-upd-update-view+)
!     (ask-for-redraw! player '[map])
  
  

Index: keys.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/keys.lisp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** keys.lisp	19 May 2003 15:42:32 -0000	1.8
--- keys.lisp	27 Jul 2003 13:52:55 -0000	1.9
***************
*** 376,384 ****
  					  +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
--- 376,384 ----
  					  +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
***************
*** 486,490 ****
  	  (print-map dungeon player)
  	  (refresh-window win)
! 	  ;;(bit-flag-add! *redraw* +print-map+)
  	  )))
  ||#
--- 486,490 ----
  	  (print-map dungeon player)
  	  (refresh-window win)
! 	  ;; (ask-for-redraw! player '[map])
  	  )))
  ||#