[langband-cvs] CVS: langband base.lisp,1.128.2.2,1.128.2.3 window.lisp,1.1.2.6,1.1.2.7
Status: Alpha
Brought to you by:
stig
From: Stig E S. <st...@us...> - 2002-12-30 14:22:47
|
Update of /cvsroot/langband/langband In directory sc8-pr-cvs1:/tmp/cvs-serv26771 Modified Files: Tag: VER_0_1_2multi base.lisp window.lisp Log Message: tweaked sizes of bitfields Index: base.lisp =================================================================== RCS file: /cvsroot/langband/langband/base.lisp,v retrieving revision 1.128.2.2 retrieving revision 1.128.2.3 diff -C2 -d -r1.128.2.2 -r1.128.2.3 *** base.lisp 14 Dec 2002 18:20:25 -0000 1.128.2.2 --- base.lisp 30 Dec 2002 14:22:44 -0000 1.128.2.3 *************** *** 21,24 **** --- 21,25 ---- (deftype u-16b () '(unsigned-byte 16)) (deftype u24b () '(unsigned-byte 24)) + (deftype u32b () '(unsigned-byte 32)) ;; (deftype vinfo-bit-type () `(unsigned-byte 32)) *************** *** 651,655 **** (defun tile-paint-value (file tile) ! (logior (dpb file (byte 8 16) 0) (dpb tile (byte 8 8) 0))) #|| --- 652,656 ---- (defun tile-paint-value (file tile) ! (logior (dpb file (byte 8 24) 0) (dpb tile (byte 16 8) 0))) #|| *************** *** 670,682 **** ||# ! ;; put the tile-number in bits 9-16 (defmacro tile-number (tile) ! `(dpb ,tile (byte 8 8) 0)) ! ;; put the tile-file in bits 17-24 (defmacro tile-file (file) ! `(dpb ,file (byte 8 16) 0)) - ;; put the tile-file in bits 17-24 (defmacro make-legal-attr (attr) `(dpb ,attr (byte 8 8) 0)) --- 671,682 ---- ||# ! ;; put the tile-number in bits 9-24 (defmacro tile-number (tile) ! `(dpb ,tile (byte 16 8) 0)) ! ;; put the tile-file in bits 25-32 (defmacro tile-file (file) ! `(dpb ,file (byte 8 24) 0)) (defmacro make-legal-attr (attr) `(dpb ,attr (byte 8 8) 0)) Index: window.lisp =================================================================== RCS file: /cvsroot/langband/langband/Attic/window.lisp,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -C2 -d -r1.1.2.6 -r1.1.2.7 *** window.lisp 20 Dec 2002 12:05:11 -0000 1.1.2.6 --- window.lisp 30 Dec 2002 14:22:44 -0000 1.1.2.7 *************** *** 22,28 **** (setf (window.data win) (make-array (list +num-gfx-layers+ width height) ! :element-type 'u24b :initial-element 0)) (setf (window.flagmap win) (make-array (list width height) ! :element-type 'u24b :initial-element 0)) win)) --- 22,28 ---- (setf (window.data win) (make-array (list +num-gfx-layers+ width height) ! :element-type 'u32b :initial-element 0)) (setf (window.flagmap win) (make-array (list width height) ! :element-type 'u32b :initial-element 0)) win)) |