From 8004c7df90b192103f94e96b106bb9b28eec9adc Mon Sep 17 00:00:00 2001 From: Juliana Sims Date: Sat, 25 May 2024 14:57:17 -0400 Subject: [PATCH] Revert "Add activation counting to switched emitters" woopsie broke switched-emitters This reverts commit 133fdb5752555c6d3d94394f2579d9b5a27f691c. --- modules/game/actors.scm | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/modules/game/actors.scm b/modules/game/actors.scm index 49c0022..e5e637d 100644 --- a/modules/game/actors.scm +++ b/modules/game/actors.scm @@ -198,7 +198,6 @@ (define timer (spawn ^cell 0)) (define on? (spawn ^cell)) (define position (vector x y 0)) - (define activations (spawn ^cell 0)) (define (wire-state) (and ($ on?) (match ($ timer) @@ -218,18 +217,12 @@ (('enter obj grid-info) #f) (('exit obj grid-info) #f) (('activate grid-info) - (let ((k (1+ ($ activations)))) - ($ activations k) - (unless (> k 1) - ($ on? #t) - ($ timer 0) - ($ grid-info 'append-event `(emitter-on ,x ,y))))) + ($ on? #t) + ($ timer 0) + ($ grid-info 'append-event `(emitter-on ,x ,y))) (('deactivate grid-info) - (let ((k (1- ($ activations)))) - ($ activations k) - (when (= k 0) - ($ on? #f) - ($ grid-info 'append-event `(emitter-off ,x ,y))))) + ($ on? #f) + ($ grid-info 'append-event `(emitter-off ,x ,y))) (('wire-state grid-info from from-x from-y) (wire-state)) (('update-wire-state grid-info neighbor-grid) #f) (('alive?) #t)