From 442746dccbd89b90947666bd10a1d7331d947f38 Mon Sep 17 00:00:00 2001
From: John Connors <johnc@yagc.ndo.co.uk>
Date: Tue, 4 Mar 2008 20:32:13 +0000
Subject: [PATCH] Fixes for ifs and lwo

---
 file-ifs.lisp | Bin 2098 -> 2107 bytes
 file-lwo.lisp |  15 +++++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/file-ifs.lisp b/file-ifs.lisp
index 06ce9eda488a28e1f5caf0948314cf6e1087a2de..30201ca6e181e2b33092e3b691901459f6958e29 100644
GIT binary patch
delta 23
ccwXBiuv=imYxc=gSVSiOW;bQm1OYBC0BcwWApigX

delta 21
acwXBrut{LUYj!qG5a62pmEE3+iwgiwL<R8x

diff --git a/file-lwo.lisp b/file-lwo.lisp
index 1ad6cbc..300301d 100644
--- a/file-lwo.lisp
+++ b/file-lwo.lisp
@@ -48,7 +48,7 @@
   (align-for-read stream +word-align+)
   (format *debug-io* "Chunk At ~X " (file-position stream))
   (setf (chunk-id-of self) (read-value 'u32 stream :endian :big))
-  (setf (chunk-size-of self) (read-value 'u32 stre :endian :big)))
+  (setf (chunk-size-of self) (read-value 'u32 stream :endian :big)))
 
 (defconstant +lwob-colr-id+ (string-id "COLR"))
 (defconstant +lwob-flag-id+ (string-id "FLAG"))
@@ -90,7 +90,7 @@
 ;; FORM -- which is raw chunked data 
 ;; LIST and CAT -- which are index collections of chunks or references to chunks
 ;; for LWO we only worry about FORMS
-(defun iff-group-parser (group in-stream out-fn)
+(defmethod iff-group-parser ((group iff-group) in-stream out-fn)
   "Parse an iff group, read from in-stream, dump to out-fn."
   (labels 
       ((skip-group ()
@@ -128,7 +128,7 @@
   "Create a parser to parse a chunk inside an LWOB group"
   `(setf (gethash ,id *lwob-chunk-parsers*) 
          (lambda (,chunk-sym ,in-sym ,out-sym)
-           (declare (ignorable ,in-sym ,out-sym))
+           (declare (ignorable ,chunk-sym ,in-sym ,out-sym))
            ,@body)))
 
 
@@ -136,7 +136,7 @@
   "Create a parser to parse a chunk inside an LWOB group"
   `(setf (gethash ,id *lwob-subchunk-parsers*) 
          (lambda (,subchunk-sym ,in-sym ,out-sym)
-           (declare (ignorable ,in-sym ,out-sym))
+           (declare (ignorable ,subchunk-sym ,in-sym ,out-sym))
            ,@body)))
 
 
@@ -255,8 +255,8 @@
     (format *debug-io* "Transparency ~A " (/ transparency 256))))
 
 (def-lwob-subchunk-parser +lwob-glos-id+ (chunk in-stream out-fn)
-  (let ((glossiness (read-value 'u16 in-stream))))
-    (format *debug-io* "Glossiness ~A " (/ glossiness 1024)))
+  (let ((glossiness (read-value 'u16 in-stream)))
+    (format *debug-io* "Glossiness ~A " (/ glossiness 1024))))
 
 (defparameter *texture-context* :colour-texture)
 
@@ -317,11 +317,10 @@
 
 (defun parse-iff-file (input-file output-fn)
   (with-open-file
-      (in-stream #P"Future3a.lwo" :element-type '(unsigned-byte 8))
+      (in-stream input-file :element-type '(unsigned-byte 8))
     (parse-groups in-stream output-fn)))
 
 
 
 
 
-)
\ No newline at end of file
-- 
2.11.4.GIT