• R/O
  • SSH

waddle: Commit

Common Lisp library for manipulating Doom and Quake WAD files and PAK files.


Commit MetaInfo

Revision42b894566872d5a52b1b70a08a73b40c7032b6b5 (tree)
Time2019-06-12 22:51:59
AuthorAlexa Jones-Gonzales <dj.haruko@gmai...>
CommiterAlexa Jones-Gonzales

Log Message

Minor fixes to compile the library in Clisp

Change Summary

Incremental Difference

diff -r 48274883d5da -r 42b894566872 src/pak-entry.lisp
--- a/src/pak-entry.lisp Wed Jun 12 07:38:00 2019 -0600
+++ b/src/pak-entry.lisp Wed Jun 12 07:51:59 2019 -0600
@@ -48,7 +48,7 @@
4848 (defmethod entry-name ((obj pak-entry))
4949 (slot-value obj 'filename))
5050
51-(defmethod (setf entry-name) ((val simple-string) (obj pak-entry))
51+(defmethod (setf entry-name) ((val string) (obj pak-entry))
5252 ;; >= to account for final \0 when writing
5353 (cond
5454 ((>= (length val) +pak-entry-name-limit+)
diff -r 48274883d5da -r 42b894566872 src/pak.lisp
--- a/src/pak.lisp Wed Jun 12 07:38:00 2019 -0600
+++ b/src/pak.lisp Wed Jun 12 07:51:59 2019 -0600
@@ -42,11 +42,11 @@
4242 (defmethod num-entries ((obj pak-file))
4343 (length (slot-value obj 'entries)))
4444
45-(defmethod get-entry ((obj pak-file) (entry simple-string))
45+(defmethod get-entry ((obj pak-file) (entry string))
4646 (find entry (slot-value obj 'entries) :test #'(lambda (ref-ent pak-ent)
4747 (string= ref-ent (entry-name pak-ent)))))
4848
49-(defmethod get-entry ((obj pak-file) (entry fixnum))
49+(defmethod get-entry ((obj pak-file) (entry integer))
5050 (elt (slot-value obj 'entries) entry))
5151
5252 (defmethod add-entry ((obj pak-file) (entry pak-entry))
@@ -66,7 +66,7 @@
6666 (entry-name check-ent)))))
6767 entry)
6868
69-(defmethod remove-entry ((obj pak-file) (entry fixnum))
69+(defmethod remove-entry ((obj pak-file) (entry integer))
7070 (let ((ret (get-entry obj entry)))
7171 (setf (slot-value obj 'entries)
7272 (concatenate 'vector
@@ -114,7 +114,7 @@
114114 ;;; PAK-FILE methods
115115 ;;;
116116
117-(defmethod directory-exists ((obj pak-file) (dir simple-string))
117+(defmethod directory-exists ((obj pak-file) (dir string))
118118 (let ((dir (if (char= (elt dir (1- (length dir))) #\/)
119119 dir (p36:strings+ dir #\/))))
120120 (with-all-entries (obj ent)
diff -r 48274883d5da -r 42b894566872 src/pal-converter.lisp
--- a/src/pal-converter.lisp Wed Jun 12 07:38:00 2019 -0600
+++ b/src/pal-converter.lisp Wed Jun 12 07:51:59 2019 -0600
@@ -37,11 +37,13 @@
3737
3838 (defparameter *color-cache*
3939 #+sbcl (make-hash-table :test 'equal :synchronized t)
40- #+ccl (make-hash-table :test 'equal))
40+ #+ccl (make-hash-table :test 'equal)
41+ #+clisp (make-hash-table :test 'equal))
4142 (defun clear-palconv-color-cache ()
4243 (setf *color-cache*
4344 #+sbcl (make-hash-table :test 'equal :synchronized t)
44- #+ccl (make-hash-table :test 'equal)))
45+ #+ccl (make-hash-table :test 'equal)
46+ #+clisp (make-hash-table :test 'equal)))
4547
4648 ;;;
4749 ;;; Utility Stuff
Show on old repository browser