[langband-cvs] CVS: langband constants.lisp,1.111.2.5,1.111.2.6 object.lisp,1.197.2.1,1.197.2.2 util.lisp,1.123.2.20,1.123.2.21

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

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

Modified Files:
      Tag: v017_loop_experiment_2
	constants.lisp object.lisp util.lisp 
Log Message:
more tweaking

Index: constants.lisp
===================================================================
RCS file: /cvsroot/langband/langband/constants.lisp,v
retrieving revision 1.111.2.5
retrieving revision 1.111.2.6
diff -C2 -d -r1.111.2.5 -r1.111.2.6
*** constants.lisp	20 Aug 2003 10:34:37 -0000	1.111.2.5
--- constants.lisp	22 Aug 2003 13:28:38 -0000	1.111.2.6
***************
*** 318,321 ****
  
  ;; walk-speed is 500msec for one square
! (def-exportconst +walk-speed+ 64) ;; pixels pr second
  (def-exportconst +walk-animation-interval+  (floor (/ +tick-precision+ 9.0)))
--- 318,326 ----
  
  ;; walk-speed is 500msec for one square
! (def-exportconst +default-tilesize+ 32)                ;; do not rely on this!!
! (def-exportconst +walk-speed+ (* 2 +default-tilesize+)) ;; pixels pr second
! (def-exportconst +run-speed+ (* 2 +walk-speed+))       ;; pixels pr second
! (def-exportconst +throw-speed+ (* 3 +walk-speed+))     ;; pixels pr second
! (def-exportconst +missile-speed+ (* 4 +walk-speed+))   ;; pixels pr second
! 
  (def-exportconst +walk-animation-interval+  (floor (/ +tick-precision+ 9.0)))

Index: object.lisp
===================================================================
RCS file: /cvsroot/langband/langband/object.lisp,v
retrieving revision 1.197.2.1
retrieving revision 1.197.2.2
diff -C2 -d -r1.197.2.1 -r1.197.2.2
*** object.lisp	22 Aug 2003 13:21:55 -0000	1.197.2.1
--- object.lisp	22 Aug 2003 13:28:38 -0000	1.197.2.2
***************
*** 129,132 ****
--- 129,133 ----
  
  
+ ;; sometimes we've assigned a special gfx-sym for that object, check for it
  (defmethod gfx-sym ((obj active-object))
    (let ((val (slot-value obj 'gfx-sym)))
***************
*** 141,144 ****
--- 142,146 ----
  	  )))
  
+ ;; sometimes we've assigned a special text-sym for that object, check for it
  (defmethod text-sym ((obj active-object))
    (let ((val (slot-value obj 'text-sym)))

Index: util.lisp
===================================================================
RCS file: /cvsroot/langband/langband/util.lisp,v
retrieving revision 1.123.2.20
retrieving revision 1.123.2.21
diff -C2 -d -r1.123.2.20 -r1.123.2.21
*** util.lisp	22 Aug 2003 13:21:55 -0000	1.123.2.20
--- util.lisp	22 Aug 2003 13:28:38 -0000	1.123.2.21
***************
*** 1627,1631 ****
  			     :move-speed (if (positive-integer? speed)
  					     speed
! 					     (* 2 +walk-speed+))
  			     :source-x sx
  			     :source-y sy
--- 1627,1631 ----
  			     :move-speed (if (positive-integer? speed)
  					     speed
! 					     (* 2 +walk-speed+)) ;; hack, fix later
  			     :source-x sx
  			     :source-y sy
***************
*** 1720,1727 ****
  		 :current-y sy
  		 :blocking? t
- 		 ;;:data (make-hash-table :test #'eq)
  		 :move-speed (if (positive-integer? speed)
  				 speed
! 				 (* 2 +walk-speed+)) ;; increase later
  		 :source-x sx
  		 :source-y sy
--- 1720,1726 ----
  		 :current-y sy
  		 :blocking? t
  		 :move-speed (if (positive-integer? speed)
  				 speed
! 				 +throw-speed+)
  		 :source-x sx
  		 :source-y sy