From 63e7dbb951446cc479d7895c404774a632c7e4d6 Mon Sep 17 00:00:00 2001
From: Remington Covert <bryce@brycecovertoperations.com>
Date: Sun, 8 Mar 2015 11:13:16 -0700
Subject: [PATCH] slightly better memory.

---
 desktop/src-common/advent/core.clj                | 6 +++++-
 desktop/src-common/advent/screens/inventory.clj   | 2 +-
 desktop/src-common/advent/screens/rooms/dream.clj | 2 +-
 desktop/src-common/advent/screens/scene.clj       | 5 +++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/desktop/src-common/advent/core.clj b/desktop/src-common/advent/core.clj
index 302c5bc6..567bfc2e 100644
--- a/desktop/src-common/advent/core.clj
+++ b/desktop/src-common/advent/core.clj
@@ -11,8 +11,12 @@
             [clojure.pprint]
             [advent.pathfind])
   (:import [com.badlogic.gdx.graphics Pixmap Pixmap$Filter Texture Texture$TextureFilter]
-          [com.badlogic.gdx.graphics.g2d TextureRegion] ))
+          [com.badlogic.gdx.graphics.g2d TextureRegion]
+          [com.badlogic.gdx Gdx Application]))
 
+(defonce am (asset-manager))
+
+(set-asset-manager! am)
 
  
 (defgame advent
diff --git a/desktop/src-common/advent/screens/inventory.clj b/desktop/src-common/advent/screens/inventory.clj
index c2b86d74..b9313666 100644
--- a/desktop/src-common/advent/screens/inventory.clj
+++ b/desktop/src-common/advent/screens/inventory.clj
@@ -33,7 +33,7 @@
                :scale-x 80
                :scale-y 80 
                :opacity 0.7)
-       :all-items (texture! (texture "cursor.png") :split 16 16)
+       :all-items (texture! (texture (pixmap "cursor.png")) :split 16 16)
        :items []
        :shown? false
        :start-showing? false
diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj
index c0ccb80d..5ed4e48f 100644
--- a/desktop/src-common/advent/screens/rooms/dream.clj
+++ b/desktop/src-common/advent/screens/rooms/dream.clj
@@ -32,6 +32,6 @@
                                      :script (actions/get-script entities (a/>! [100 100]))}}
               :layers [(assoc (texture "dream/background.png") :x 0 :y 0 :baseline 0)]
               :entities {}
-              :collision "space/background.png"
+              :collision "dream/collision.png"
               :scale-fn (constantly 1.5) 
               :start-pos [140 55]))
diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj
index 2b5738f2..936562fa 100644
--- a/desktop/src-common/advent/screens/scene.clj
+++ b/desktop/src-common/advent/screens/scene.clj
@@ -691,8 +691,9 @@
                            (tween/tween :fade-out-music screen [:volume :value] 1.0 0.0 1.0))
                  (assoc-in [:tweens :fade-out]
                            (tween/tween :fade-out screen [:fade :opacity] 0.0 1.0 1.0
-                                        :finish #(do (set-screen! @(resolve 'advent.core/advent) @(resolve 'advent.screens.title/title-screen))
-                                                                                                   %)))))
+                                        :finish #(do (.clear @(resolve 'advent.core/am))
+                                                   (set-screen! @(resolve 'advent.core/advent) @(resolve 'advent.screens.title/title-screen))
+                                                   %)))))
 
   :on-start-script (fn [{:keys [script]} [entities]]
                      (script entities)