Moving looking to be primarily a gameobj action.

[mudsync.git] / mudsync / command.scm

diff --git a/mudsync/command.scm b/mudsync/command.scm
index 6314c70fbcdc88e162b55af1c62d0e9373989aab..95e04c5282b83d6b05a991071d62f7788340fe02 100644 (file)
--- a/mudsync/command.scm
+++ b/mudsync/command.scm
@@ -18,6 +18,7 @@
 
 (define-module (mudsync command)
   #:use-module (mudsync parser)
+  #:use-module (mudsync utils)
   #:use-module (8sync actors)
   #:use-module (8sync rmeta-slot)
   #:use-module (srfi srfi-1)
@@ -90,7 +91,7 @@
                        ...))))))
 
 (define-syntax-rule (build-commands (verb-or-verbs cmd-defs ...) ...)
-  (wrap-rmeta-slot
+  (build-rmeta-slot
    (append (%build-command verb-or-verbs cmd-defs ...) ...)))
 
 
@@ -100,7 +101,7 @@
                 ;; @@: Should we allow fancier matching than this?
                 ;;   Let the actor itself pass along this whole method?
                 (lambda* (goes-by #:key direct-obj)
-                  (member direct-obj goes-by))
+                  (ci-member direct-obj goes-by))
                 action
                 %default-priority
                 obvious?))
@@ -123,9 +124,9 @@
                 (lambda* (goes-by #:key direct-obj indir-obj preposition)
                   (if prepositions
                       (and
-                       (member indir-obj goes-by)
-                       (member preposition prepositions))
-                      (member indir-obj goes-by)))
+                       (ci-member indir-obj goes-by)
+                       (ci-member preposition prepositions))
+                      (ci-member indir-obj goes-by)))
                 action
                 %high-priority
                 obvious?))
@@ -137,9 +138,9 @@
                 (lambda* (goes-by #:key direct-obj indir-obj preposition)
                   (if prepositions
                       (and
-                       (member  direct-obj goes-by)
-                       (member preposition prepositions))
-                      (member direct-obj goes-by)))
+                       (ci-member  direct-obj goes-by)
+                       (ci-member preposition prepositions))
+                      (ci-member direct-obj goes-by)))
                 action
                 %high-priority
                 obvious?))
@@ -178,7 +179,7 @@
   (make-command verbs
                 cmatch-direct-obj-greedy
                 (lambda* (goes-by #:key direct-obj rest)
-                  (member direct-obj goes-by))
+                  (ci-member direct-obj goes-by))
                 action
                 %low-priority
                 obvious?))