From 9003ca0bdf176590d196421137470e02b0d66967 Mon Sep 17 00:00:00 2001
From: Bryce Covert <git@brycecovertoperations.com>
Date: Wed, 31 May 2017 22:01:35 -0700
Subject: [PATCH] first RC build.

---
 desktop/gametodos.txt                       | 2 --
 desktop/src-common/advent/core.clj          | 6 ------
 desktop/src-common/advent/screens/scene.clj | 3 +--
 desktop/src-common/advent/screens/title.clj | 3 ++-
 ios/Info.plist.xml                          | 4 +++-
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt
index a6730b98..4d16da53 100644
--- a/desktop/gametodos.txt
+++ b/desktop/gametodos.txt
@@ -1,7 +1,5 @@
 MOBILE
 
 Desktop buttons are wrong size
-background loading of assets?
 loading image?
-reset inventory text on open up
 
diff --git a/desktop/src-common/advent/core.clj b/desktop/src-common/advent/core.clj
index da5bb766..460d807d 100644
--- a/desktop/src-common/advent/core.clj
+++ b/desktop/src-common/advent/core.clj
@@ -22,12 +22,6 @@
           [java.io FileOutputStream File PrintStream])
   )
 
-(defn g []
-  (log/info "ABC"))
-
-(defn a []
-  (g))
-
 (defonce am (asset-manager))
 
 (set-asset-manager! am)
diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj
index 08ade684..fe8b6f33 100644
--- a/desktop/src-common/advent/screens/scene.clj
+++ b/desktop/src-common/advent/screens/scene.clj
@@ -1217,7 +1217,7 @@
                    :inside-antique (wrap rooms.inside-antique/make "packed/inside-antique.atlas") 
                    :inside-jail (wrap rooms.inside-jail/make "packed/inside-jail.atlas") 
                    :dream (wrap rooms.dream/make "packed/dream.atlas") 
-                   :ending (wrap rooms.ending/make "packed/ending.atlas") 
+                   :ending (wrap rooms.ending/make "packed/ending-castle.atlas") 
                    :castle-gate (wrap rooms.castle-gate/make "packed/castle-gate.atlas") 
                    :outside-jail (wrap rooms.outside-jail/make "packed/outside-jail.atlas") 
                    :outside-castle (wrap rooms.outside-castle/make "packed/outside-castle.atlas") }
@@ -1357,7 +1357,6 @@
 
   :on-pinch
   (fn [screen entities {:keys [initial-pointer-1 initial-pointer-2 pointer-1 pointer-2]}]
-    (log/info "pinching...")
     (when (get-in entities [:state :active?])
       (let [start-zoom (get-in entities [:cam :start-zoom])
             zoom (get-in entities [:cam :zoom])
diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj
index 40a3f0d2..f423e556 100644
--- a/desktop/src-common/advent/screens/title.clj
+++ b/desktop/src-common/advent/screens/title.clj
@@ -369,6 +369,7 @@
   (fn [screen entities options]
     (let [[screen global-atlas] (utils/acquire-atlas screen "packed/global.atlas")
           [screen title-atlas] (utils/acquire-atlas screen "packed/title.atlas")
+          _ (update! screen :texture-atlas title-atlas)
           screen (utils/setup-viewport screen 1280 960)] 
       (log/info "Starting title screen.")
       
@@ -569,7 +570,7 @@
                 (utils/remove-save (:id (:selected-save entities)))
                 (as-> entities entities
                       (utils/remove-actor-from-stage entities :confirm-delete)
-                      (assoc entities :saves-list (utils/snapshot-screenshots (-> screen :resources :default second)))
+                      (assoc entities :saves-list (utils/snapshot-screenshots (-> screen :texture-atlas)))
                       (assoc entities :save-menu (->> (saves-menu entities (:renderer screen))
                                                       (utils/add-actor-to-stage screen))))) 
 
diff --git a/ios/Info.plist.xml b/ios/Info.plist.xml
index 2e582016..a61ac45d 100644
--- a/ios/Info.plist.xml
+++ b/ios/Info.plist.xml
@@ -21,7 +21,7 @@
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>119</string>
+    <string>121</string>
     <key>MinimumOSVersion</key>
     <string>8.0</string>
     <key>LSRequiresIPhoneOS</key>
@@ -35,6 +35,8 @@
     <string>{320,568}</string>
     <key>UILauunchImages</key>
     <array>
+        <string>Default</string>
+        <string>Default@2x</string>
         <string>Default-568h</string>
         <string>Default-568h@2x</string>
         <string>Default-Portrait~ipad</string>