more dynamic dispatch of commands

[mudsync.git] / mudsync / gameobj.scm

diff --git a/mudsync/gameobj.scm b/mudsync/gameobj.scm
index 37f8bfefa8d07ebb85be81a9e17705089703f2b8..921850eef534cde51c23a18a1d9be3a7d91d493c 100644 (file)
--- a/mudsync/gameobj.scm
+++ b/mudsync/gameobj.scm
@@ -24,6 +24,7 @@
   #:use-module (8sync systems actors)
   #:use-module (8sync agenda)
   #:use-module (srfi srfi-1)
+  #:use-module (ice-9 match)
   #:use-module (oop goops)
   #:export (<gameobj>
             gameobj-simple-name-f
@@ -103,6 +104,12 @@
     (reply-message actor message
                    #:val (slot-ref actor slot))))
 
+(define (val-or-run val-or-proc)
+  "Evaluate if a procedure, or just return otherwise"
+  (if (procedure? val-or-proc)
+      (val-or-proc)
+      val-or-proc))
+
 (define (filter-commands commands verb)
   (filter
    (lambda (cmd)
@@ -112,13 +119,13 @@
 
 (define-mhandler (gameobj-get-commands actor message verb)
   (define filtered-commands
-    (filter-commands (slot-ref actor 'commands)
+    (filter-commands (val-or-run (slot-ref actor 'commands))
                      verb))
   (<-reply actor message #:commands filtered-commands))
 
 (define-mhandler (gameobj-get-container-commands actor message verb)
   (define filtered-commands
-    (filter-commands (slot-ref actor 'container-commands)
+    (filter-commands (val-or-run (slot-ref actor 'container-commands))
                      verb))
   (<-reply actor message #:commands filtered-commands))