From 0b367c3efc188741ad80a7e9b36d819f1de46e30 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Tue, 18 Aug 2015 21:13:22 -0700 Subject: [PATCH] clunky workaround --- desktop/src-common/advent/screens/rooms/inside_castle.clj | 2 +- desktop/src/advent/core/desktop_launcher.clj | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 78735627..2b7df332 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -444,7 +444,7 @@ :baseline 239) :pull-sword (assoc (animation->texture screen pull-sword-anim) :x 10 - :y 40 + :y 20 :baseline 240 :pull-sword pull-sword-anim) :hotspots [{:box [0 74 77 109] diff --git a/desktop/src/advent/core/desktop_launcher.clj b/desktop/src/advent/core/desktop_launcher.clj index 0d4fc037..9e5027d5 100644 --- a/desktop/src/advent/core/desktop_launcher.clj +++ b/desktop/src/advent/core/desktop_launcher.clj @@ -19,7 +19,9 @@ (defn -main [& [port]] - (when port (start-nrepl-expr (Integer/parseInt port))) + (try + (when port (start-nrepl-expr (Integer/parseInt port))) + (catch Exception e)) (let [cfg (LwjglApplicationConfiguration.)] (if false (do