notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'background_scripts'

Browse Source
This commit is contained in:
Bryce Covert
2015-11-22 15:37:45 -08:00
parent ae1a59d8f6 e7f8313b9e
commit 709477324c
10 changed files with 150 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
desktop/src-common/advent/utils.clj
View File

@@ -348,10 +348,10 @@
(< y1 y (+ y1 height))))
(defn is-unstoppable-script-running [screen entities]
(let [current-action (get-in entities [:actions :current])
is-script-running (get-in entities [:actions :script-running?])]
(let [current-action (get-in entities [:fg-actions :current])
is-script-running (get-in entities [:fg-actions :script-running?])]
(and is-script-running
(= :none (get-in entities [:actions :last-skip-type])))))
(= :none (get-in entities [:fg-actions :last-skip-type])))))
(defn update-override [{:keys [^FitViewport viewport] :as screen} entities]
(let [raw-pos (get-in entities [:cursor :last-pos])