summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Thompson <dthompson2@worcester.edu>2016-04-25 08:51:47 -0400
committerDavid Thompson <dthompson2@worcester.edu>2016-04-25 08:51:47 -0400
commit1a83132fec473c4a5c590acd8b50cf88e4d2965e (patch)
tree5757cc6451862fee4018b9e9eb09370a6b674ef8
parent9ba9ec7ae64ed177be9d04293779ca65942fd276 (diff)
actor: Fix effect handling in 'both'.
Bug: If action B was completed then the effects it returned were discarded.
-rw-r--r--sly/actor.scm6
1 files changed, 3 insertions, 3 deletions
diff --git a/sly/actor.scm b/sly/actor.scm
index 5b6d7e3..90803e7 100644
--- a/sly/actor.scm
+++ b/sly/actor.scm
@@ -133,9 +133,9 @@ to perform."
(if next
(let-values (((next* new-effects* new-object*)
(b world new-effects new-object)))
- (if next*
- (values (both next next*) new-effects* new-object*)
- (values next new-effects new-object*)))
+ (values (if next* (both next next*) next)
+ new-effects*
+ new-object*))
(b world new-effects new-object)))))
(define (then a b)