From 17d42adaf553d0affc5bc76b4368a5afa2ed18c6 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Fri, 19 Sep 2014 16:46:06 -0700 Subject: [PATCH] more interactions. --- desktop/resources/behindhouse/collision.png | Bin 6503 -> 6517 bytes desktop/resources/cursor.png | Bin 2244 -> 2257 bytes desktop/src-common/advent/screens/scene.clj | 19 ++++++++++++++++--- desktop/src-common/advent/utils.clj | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/desktop/resources/behindhouse/collision.png b/desktop/resources/behindhouse/collision.png index ce805620b076bcbed5a73a8e8cee6c48caca2976..2170857e5fb3c3cab431568265467281bf2a6333 100644 GIT binary patch delta 4260 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 screen {:x (:input-x screen) :y (:input-y screen)})] (println (:input-x screen) (:input-y screen) "->" x y))) -(def +all-cursors+ [:main :wool :look :talk :right :down :left :up]) +(def +all-cursors+ [:main :wool :mushrooms :talk :right :down :left :up]) (defn cursor [filename which] (let [scale 2