X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=blobdiff_plain;f=mudsync.scm;h=8cc07b1389bb5fff85619774ace295b6b8aca8a3;hp=cdc03fd3d408f7dc1dc2e164adbba1e46b50fea2;hb=787335368937c1a07a0a098b8aa9b616c76ffebb;hpb=ea3774311efdb27eaeff459aef3d91d28c8fe0ff

diff --git a/mudsync.scm b/mudsync.scm
index cdc03fd..8cc07b1 100644
--- a/mudsync.scm
+++ b/mudsync.scm
@@ -377,9 +377,18 @@ with an anonymous persona"
 ;;; derive from this class.
 ;;; And all of them need a GM!
 
-(define-class <game-actor> (<actor>)
+(define-class <gameobj> (<actor>)
+  ;; location id
+  (loc #:init-value #f
+       #:accessor gameobj-loc)
+  ;; game master id
   (gm #:init-keyword #:gm
-      #:getter game-actor-gm))
+      #:getter gameobj-gm)
+
+  ;; Commands we can handle
+  (commands #:init-value #f)
+  ;; Commands we can handle by being something's container
+  (contain-commands #:init-value #f))
 
 
 
@@ -426,7 +435,7 @@ with an anonymous persona"
                    #:val (slot-ref actor slot))))
 
 
-(define-class <room> (<game-actor>)
+(define-class <room> (<gameobj>)
   (name #:init-keyword #:name)
   (desc #:init-value ""
                #:init-keyword #:desc)
@@ -461,7 +470,7 @@ claim to point to."
   (for-each
    (lambda (exit)
      (define new-exit
-       (<-wait room (game-actor-gm room) 'lookup-room
+       (<-wait room (gameobj-gm room) 'lookup-room
                #:symbol (exit-to-symbol exit)))
 
      (set! (exit-to-address exit) new-exit))
@@ -473,12 +482,9 @@ claim to point to."
 ;;; Players
 ;;; =======
 
-(define-class <player> (<game-actor>)
+(define-class <player> (<gameobj>)
   (username #:init-keyword #:username
             #:accessor player-username)
-  ;; location id
-  (loc #:init-value #f
-       #:accessor player-loc)
   ;; Connection id
   (client #:accessor player-client)
 
@@ -491,9 +497,9 @@ claim to point to."
 ;;; player message handlers
 
 (define-mhandler (player-set-loc! player message id)
-  (format #t "DEBUG: Location set to ~s for player ~s"
+  (format #t "DEBUG: Location set to ~s for player ~s\n"
           id (actor-id-actor player))
-  (set! (player-loc player) id))
+  (set! (gameobj-loc player) id))
 
 (define-mhandler (player-init! player message)
   (player-look-around player))
@@ -503,16 +509,16 @@ claim to point to."
 (define (player-look-around player)
   (define room-name
     (message-ref
-     (<-wait player (player-loc player) 'get-name)
+     (<-wait player (gameobj-loc player) 'get-name)
      'val))
   (define room-desc
     (message-ref
-     (<-wait player (player-loc player) 'get-desc)
+     (<-wait player (gameobj-loc player) 'get-desc)
      'val))
   (define message-text
     (format #f "**~a**\n~a\n" room-name room-desc))
 
-  (<- player (game-actor-gm player) 'write-home #:text message-text))
+  (<- player (gameobj-gm player) 'write-home #:text message-text))
 
 
 ;;; Debugging stuff