From 90d22ae98107c7d90717b9bc5d0900203277df83 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Sun, 19 Feb 2017 19:48:27 -0800 Subject: [PATCH] temporarily turning off autosave which was causing crashes. --- desktop/gametodos.txt | 4 ++++ desktop/src-common/advent/actions.clj | 3 +-- desktop/src-common/advent/screens/inventory.clj | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index f4661d66..1fe310c3 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -9,3 +9,7 @@ inventory selected item needs to be rendered on top CLOJURE 1.8 direct linking +sometimes arrow takes override +hard to leave castle gate +obvious about calculating path? seems to just pause a long time + diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj index e22613d9..afb711ea 100644 --- a/desktop/src-common/advent/actions.clj +++ b/desktop/src-common/advent/actions.clj @@ -102,8 +102,7 @@ (let [~entities (atom starting-entities#)] (thread (binding [*fg-bg-key* :fg-actions] ~@forms - (change-script-state ~entities false) - (utils/save @~entities "autosave" "Autosave")))))))) + (change-script-state ~entities false)))))))) (defn force-end [entities current-action key] (do (when current-action diff --git a/desktop/src-common/advent/screens/inventory.clj b/desktop/src-common/advent/screens/inventory.clj index 720824a6..77151c61 100644 --- a/desktop/src-common/advent/screens/inventory.clj +++ b/desktop/src-common/advent/screens/inventory.clj @@ -115,7 +115,7 @@ :on-show (fn [screen entities options] (let [screen (utils/setup-viewport screen 1280 960) - hovered-text (assoc (label "Hello" (style :label (utils/get-font "ego/font.fnt") (color :white)) :set-font-scale 0.25) :x 0 :y 850 :width 1280 )] + hovered-text (assoc (label "" (style :label (utils/get-font "ego/font.fnt") (color :white)) :set-font-scale 0.25) :x 0 :y 850 :width 1280 )] (label! hovered-text :set-alignment Align/bottom) (utils/add-actor-to-stage screen hovered-text) {:overlay (assoc (utils/get-texture "inventory-overlay.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :opacity 0.0) @@ -163,6 +163,7 @@ (when-not (:shown? entities) (label! (entities :hovered-text) :set-text "") (-> entities + (assoc-in [:hovered-text :text] "") (assoc :shown? true :opacity 0.0 :items (into {} (for [[item index] (map vector items (range))