[langband-cvs] CVS: langband/variants/vanilla print.lisp,1.46.2.3,1.46.2.4 keys.lisp,1.111.2.2,1.111.2.3

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

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

Modified Files:
      Tag: v017_loop_experiment_2
	print.lisp keys.lisp 
Log Message:
more tweaking of birth-parameters and background setting handling, plus improved handling of window commands

Index: print.lisp
===================================================================
RCS file: /cvsroot/langband/langband/variants/vanilla/print.lisp,v
retrieving revision 1.46.2.3
retrieving revision 1.46.2.4
diff -C2 -d -r1.46.2.3 -r1.46.2.4
*** print.lisp	23 Sep 2003 09:32:52 -0000	1.46.2.3
--- print.lisp	6 Oct 2003 00:24:08 -0000	1.46.2.4
***************
*** 229,234 ****
  (defmethod display-player-skills ((variant vanilla-variant) player term settings)
    (declare (ignore term))
!   (let* ((row (setting-lookup settings "skills-y" 10))
! 	 (col (setting-lookup settings "skills-x" 42))
  	 (value-attr (setting-lookup settings "value-attr" +term-l-green+))
  	 (sk-attr (setting-lookup settings "title-attr" +term-white+)))
--- 229,236 ----
  (defmethod display-player-skills ((variant vanilla-variant) player term settings)
    (declare (ignore term))
!   (let* ((offset-x (setting-lookup settings "offset-x" 0))
! 	 (offset-y (setting-lookup settings "offset-y" 0))
! 	 (col (+ offset-x (setting-lookup settings "skills-x" 42)))
! 	 (row (+ offset-y (setting-lookup settings "skills-y" 10)))
  	 (value-attr (setting-lookup settings "value-attr" +term-l-green+))
  	 (sk-attr (setting-lookup settings "title-attr" +term-white+)))
***************
*** 271,278 ****
    (declare (ignore term))
  
!   (let* ((title-attr (setting-lookup settings "title-attr" +term-white+))
  	 (value-attr (setting-lookup settings "value-attr" +term-l-blue+))
! 	 (col (setting-lookup settings "combat-x" 26))
! 	 (row (setting-lookup settings "combat-y" 13))
  	 (f-col (+ col 7))
  
--- 273,282 ----
    (declare (ignore term))
  
!   (let* ((offset-x (setting-lookup settings "offset-x" 0))
! 	 (offset-y (setting-lookup settings "offset-y" 0))
! 	 (title-attr (setting-lookup settings "title-attr" +term-white+))
  	 (value-attr (setting-lookup settings "value-attr" +term-l-blue+))
! 	 (col (+ offset-x (setting-lookup settings "combat-x" 26)))
! 	 (row (+ offset-y (setting-lookup settings "combat-y" 13)))
  	 (f-col (+ col 7))
  

Index: keys.lisp
===================================================================
RCS file: /cvsroot/langband/langband/variants/vanilla/keys.lisp,v
retrieving revision 1.111.2.2
retrieving revision 1.111.2.3
diff -C2 -d -r1.111.2.2 -r1.111.2.3
*** keys.lisp	23 Sep 2003 12:30:39 -0000	1.111.2.2
--- keys.lisp	6 Oct 2003 00:24:08 -0000	1.111.2.3
***************
*** 148,159 ****
      #'(lambda (dungeon player)
  	(flush-messages! t)
  	(with-full-frame ()
! 	  (texture-background! +full-frame+ "textures/plainbook.png" -1)
  	  (clear-window *cur-win*)
  	  (block display-input 
  	    (let ((loc-table (gethash :display *current-key-table*)))
  	      (loop
! 	       (clear-window +full-frame+)
  	       (display-creature *variant* player)
  	       ;;(put-coloured-line! +term-white+ "['C' to show combat-info, 'R' to show resists,  ESC to continue]"
  	       ;;5 (get-last-console-line))
--- 148,166 ----
      #'(lambda (dungeon player)
  	(flush-messages! t)
+ 
+ 
  	(with-full-frame ()
! 		       
  	  (clear-window *cur-win*)
+ 	    
  	  (block display-input 
  	    (let ((loc-table (gethash :display *current-key-table*)))
  	      (loop
! 	       (clear-window +full-frame+ +foreground+)
! 	       (load-setting-background *variant* *cur-win* (get-setting *variant* :char-display))
  	       (display-creature *variant* player)
+ 	       (paint-window +full-frame+)
+ 	       (flush-window +full-frame+)
+ 	       
  	       ;;(put-coloured-line! +term-white+ "['C' to show combat-info, 'R' to show resists,  ESC to continue]"
  	       ;;5 (get-last-console-line))
***************
*** 170,174 ****
  			)))
  	       )))
! 	  (texture-background! +full-frame+ "" -1)
  	  (clear-window +full-frame+)
  
--- 177,181 ----
  			)))
  	       )))
! 	  ;;(texture-background! +full-frame+ "" -1)
  	  (clear-window +full-frame+)