From 0945a7fa78b601814e43afff2ba3e9c33e8bdb07 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Fri, 11 Sep 2015 13:45:27 -0700 Subject: [PATCH] minor tweak --- desktop/gametodos.txt | 2 +- desktop/src-common/advent/actions.clj | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index 119a8f7e..ee460948 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -6,8 +6,8 @@ PROGRAMMING + proper save/settings file location + Save slots? + try to have dialogue for every wrong interaction -+ Dialogue frozen + ending credits ++ preload all sounds AUDIO + Walking diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj index 7d259362..641b3418 100644 --- a/desktop/src-common/advent/actions.clj +++ b/desktop/src-common/advent/actions.clj @@ -435,11 +435,13 @@ (continue [this screen entities] entities) - (done? [this screen entities] (not (nil? @selected-index))) + (done? [this screen entities] + (not (nil? @selected-index))) (terminate [this screen entities] - (screen! @(resolve 'advent.screens.scene/scene) :on-reactivate) - entities) + (-> entities + (assoc-in [:state :active?] true) + (assoc-in [:cursor :override] nil))) (skip-type [this screen entities] :skip))