Can FINALLY interact with objects! Woohoo!

[mudsync.git] / mudsync / gameobj.scm

diff --git a/mudsync/gameobj.scm b/mudsync/gameobj.scm
index a418cf0c1566b38622dd61d74264f389605c5458..bb4c8520628ba0a0b4dcb56f9babfb86564b9a64 100644 (file)
--- a/mudsync/gameobj.scm
+++ b/mudsync/gameobj.scm
@@ -51,7 +51,8 @@
    (remove-occupant! (wrap-apply gameobj-remove-occupant!))
    (set-loc! (wrap-apply gameobj-set-loc!))
    (get-name (wrap-apply gameobj-get-name))
    (remove-occupant! (wrap-apply gameobj-remove-occupant!))
    (set-loc! (wrap-apply gameobj-set-loc!))
    (get-name (wrap-apply gameobj-get-name))

-   (get-desc (wrap-apply gameobj-get-desc))))
+   (get-desc (wrap-apply gameobj-get-desc))
+   (goes-by (wrap-apply gameobj-goes-by))))

 
 ;;; *all* game components that talk to players should somehow
 ;;; derive from this class.
 
 ;;; *all* game components that talk to players should somehow
 ;;; derive from this class.


@@ -71,7 +72,9 @@
       #:getter gameobj-gm)
   ;; a name to be known by
   (name #:init-keyword #:name
       #:getter gameobj-gm)
   ;; a name to be known by
   (name #:init-keyword #:name

-        #:accessor gameobj-name)
+        #:init-value #f)
+  (goes-by #:init-keyword #:goes-by
+           #:init-value #f)

 
   (desc #:init-value ""
         #:init-keyword #:desc)
 
   (desc #:init-value ""
         #:init-keyword #:desc)


@@ -81,10 +84,6 @@
           #:getter gameobj-name-f
           #:init-value (wrap gameobj-simple-name-f))
 
           #:getter gameobj-name-f
           #:init-value (wrap gameobj-simple-name-f))
 

-  ;; Name aliases
-  (aliases #:init-keyword #:aliases
-           #:init-value '())
-

   ;; Commands we can handle
   (commands #:init-value '())
 
   ;; Commands we can handle
   (commands #:init-value '())
 


@@ -111,6 +110,15 @@
   "Your most basic game object init procedure.  Does nothing."
   #f)
 
   "Your most basic game object init procedure.  Does nothing."
   #f)
 

+(define (gameobj-goes-by gameobj)
+  "Find the name we go by.  Defaults to #:name if nothing else provided."
+  (cond ((slot-ref gameobj 'goes-by) =>
+         identity)
+        ((slot-ref gameobj 'name) =>
+         (lambda (name)
+           (list name)))
+        (else '())))
+

 (define (val-or-run val-or-proc)
   "Evaluate if a procedure, or just return otherwise"
   (if (procedure? val-or-proc)
 (define (val-or-run val-or-proc)
   "Evaluate if a procedure, or just return otherwise"
   (if (procedure? val-or-proc)


@@ -128,7 +136,9 @@
   (define filtered-commands
     (filter-commands (val-or-run (slot-ref actor 'commands))
                      verb))
   (define filtered-commands
     (filter-commands (val-or-run (slot-ref actor 'commands))
                      verb))

-  (<-reply actor message #:commands filtered-commands))
+  (<-reply actor message
+           #:commands filtered-commands
+           #:goes-by (gameobj-goes-by actor)))

 
 (define-mhandler (gameobj-get-container-commands actor message verb)
   (define filtered-commands
 
 (define-mhandler (gameobj-get-container-commands actor message verb)
   (define filtered-commands


@@ -170,5 +180,3 @@
 (define (gameobj-simple-name-f gameobj)
   "Simplest version: return ourselves for our name."
   (gameobj-name gameobj))
 (define (gameobj-simple-name-f gameobj)
   "Simplest version: return ourselves for our name."
   (gameobj-name gameobj))

-
-