Merge branch 'refactor-with-def'

1 files changed, 8 insertions, 8 deletions

diff --git a/examples/09-ghoulspree.lisp b/examples/09-ghoulspree.lisp
index 33a5423..04b1043 100644
--- a/examples/09-ghoulspree.lisp
+++ b/examples/09-ghoulspree.lisp
@@ -2,20 +2,20 @@
 
 (defpackage #:ww.examples/9
   (:use #:cl)
-  (:export #:start)
-  (:import-from #:defclass-std #:defclass/std))
+  (:export #:start))
 
 (in-package #:ww.examples/9)
 
 ;;; CLASSES
 
-(defclass/std  ghoulspree (ww::application)
-  ((ghouls-per-click :std 20)
-   (collision-on-p :std t)
-   (gravity-on-p :std nil)))
+(def:class ghoulspree (ww:application)
+  (ghouls-per-click :type fixnum :initform 20)
+  (collision-on-p :type boolean :initform t)
+  (gravity-on-p :type boolean :initform nil))
+
+(def:class ghoul (ww:image)
+  (dx dy dr :type fixnum :initform 0))
 
-(defclass/std ghoul (ww:image)
-  ((dx dy dr :std)))
 
 ;;; UTILITY FUNCTIONS