Updating mudsync for 8sync suspendable-ports refactor

[mudsync.git] / mudsync / gameobj.scm

diff --git a/mudsync/gameobj.scm b/mudsync/gameobj.scm
index 9d4a91380a660c04f0106e8dd557d9f669aa871f..20fc291340198c25e12ad2c718c985e55ad35c42 100644 (file)
--- a/mudsync/gameobj.scm
+++ b/mudsync/gameobj.scm
@@ -262,12 +262,13 @@ Assists in its replacement of occupants if necessary and nothing else."
   (format #t "DEBUG: Location set to ~s for ~s\n"
           loc (actor-id-actor gameobj))
 
-  (slot-set! gameobj 'loc loc)
-  ;; Change registation of where we currently are
-  (if loc
-      (<-wait gameobj loc 'add-occupant! #:who (actor-id gameobj)))
-  (if old-loc
-      (<-wait gameobj old-loc 'remove-occupant! #:who (actor-id gameobj))))
+  (when (not (equal? old-loc loc))
+    (slot-set! gameobj 'loc loc)
+    ;; Change registation of where we currently are
+    (if old-loc
+        (<-wait gameobj old-loc 'remove-occupant! #:who (actor-id gameobj)))
+    (if loc
+        (<-wait gameobj loc 'add-occupant! #:who (actor-id gameobj)))))
 
 ;; @@: Should it really be #:id ?  Maybe #:loc-id or #:loc?
 (define-mhandler (gameobj-act-set-loc! actor message loc)
@@ -364,6 +365,6 @@ By default, this is whether or not the generally-visible flag is set."
               #:symbol special-symbol)
       'val))
     ;; if it's false, return nothing
-    ((#f #f))
+    (#f #f)
     ;; otherwise it's probably an address, return it as-is
     (_ special-symbol)))