commands finally dispatch

[mudsync.git] / mudsync / room.scm

diff --git a/mudsync/room.scm b/mudsync/room.scm
index b6164da14fcbd3310d75aa8f3fb4c063af275c14..1a898cc5262347c485487556dca357135a5a6d8a 100644 (file)
--- a/mudsync/room.scm
+++ b/mudsync/room.scm
@@ -17,11 +17,15 @@
 ;;; along with Mudsync.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (mudsync room)
+  #:use-module (mudsync command)
   #:use-module (mudsync gameobj)
   #:use-module (8sync systems actors)
   #:use-module (8sync agenda)
   #:use-module (oop goops)
   #:export (<room>
+            room-actions
+            room-actions*
+
             <exit>))
 
 ;;; Rooms
@@ -56,62 +60,38 @@
                            #:optional (target-actor (actor-id actor)))
   ((slot-ref exit 'traverse-check) exit actor target-actor))
 
-
-;; Kind of a useful utility, maybe?
-(define (simple-slot-getter slot)
-  (lambda (actor message)
-    (reply-message actor message
-                   #:val (slot-ref actor slot))))
-
-(define always (const #t))
-
-;; TODO: remove hack
-(define full-command list)
-
-;; TODO: fill these in
-(define cmatch-just-verb #f)
-(define cmatch-direct-verb #f)
-(define cmatch-direct-obj #f)
-
 (define %room-contain-commands
   (list
-   (full-command "look" cmatch-just-verb always 'look-room)
-   (full-command "look" cmatch-direct-obj always 'look-member)
-   (full-command "go" cmatch-just-verb always 'go-where)
-   (full-command "go" cmatch-direct-obj always 'go-exit)))
+   (loose-direct-command "look" 'cmd-look-at)
+   (empty-command "look" 'cmd-look-room)
+   (loose-direct-command "go" 'cmd-go)))
 
 ;; TODO: Subclass from container?
 (define-class <room> (<gameobj>)
-  (desc #:init-value ""
-        #:init-keyword #:desc)
-  ;; TODO: Switch this to be loc based
-  ;; Uses a hash table like a set (values ignored)
-  (occupants #:init-thunk make-hash-table)
   ;; A list of <exit>
   (exits #:init-value '()
          #:getter room-exits)
-  ;; @@: Maybe eventually <room> will inherit from some more general
-  ;;  game object class
 
-  (contain-commands
+  (container-commands
    #:init-value %room-contain-commands)
 
   (message-handler
    #:allocation #:each-subclass
-   #:init-value
-   (make-action-dispatch
-    ;; desc == description
-    (get-desc
-     (simple-slot-getter 'desc))
-    (get-name
-     (simple-slot-getter 'name))
-    ((register-occupant! actor message who)
-     "Register an actor as being a occupant of this room"
-     (hash-set! (slot-ref actor 'occupants) who #t))
-    ((evict-occupant! actor message who)
-     "De-register an occupant removed from the room"
-     (hash-remove! (slot-ref actor 'occupants) who))
-    (wire-exits! (wrap-apply room-wire-exits!)))))
+   ;; @@: Can remove this indirection once things settle
+   #:init-value (wrap-apply room-action-dispatch)))
+
+
+(define room-actions
+  (build-actions
+   ;; desc == description
+   (wire-exits! (wrap-apply room-wire-exits!))))
+
+(define room-actions*
+  (append room-actions gameobj-actions))
+
+(define room-action-dispatch
+  (simple-dispatcher room-actions*))
+
 
 (define (room-wire-exits! room message)
   "Actually hook up the rooms' exit addresses to the rooms they