(no commit message)

[gacela.git] / gacela_objects.lisp

diff --git a/gacela_objects.lisp b/gacela_objects.lisp
index 00ade7fd0d7503419091d7967517692f859ead5c..7ab8eb773a89ef9a3bd30e4851c3f7f3849c9d5f 100755 (executable)
--- a/gacela_objects.lisp
+++ b/gacela_objects.lisp
@@ -74,9 +74,15 @@
     active-objects))
 
 
-(defmacro make-object (&key name class attr bhv look)
+(defun make-object-old (name &key attr bhv look)
+  (let ((object
+        `(:name ,name :attr ,(make-object-attributes attr) :bhv ,(make-object-behaviour bhv) :look ,look)))
+    (add-object object)
+    object))
+
+(defmacro make-object (name attr bhv &body look)
   `(let ((object
-         '(:name ,name :class ,class :attr ,(make-object-attributes attr) :bhv ,(make-object-behaviour bhv) :look ,look)))
+        '(:name ,name :attr ,(make-object-attributes attr) :bhv ,(make-object-behaviour bhv) :look (lambda () ,@look))))
      (add-object object)
      object))
 
@@ -95,5 +101,6 @@
     `(,pname ,value)))
 
 (defun make-object-behaviour (bhv)
-  (cond ((consp bhv) bhv)
-       (t (list bhv))))
+  (cond ((null bhv) nil)
+       ((atom bhv) (list bhv))
+       (t bhv)))