From f10639ed9972aff8cb591b2a2bc1a9a0ae1f0bb7 Mon Sep 17 00:00:00 2001
From: oakes <zsoakes@gmail.com>
Date: Fri, 26 Sep 2014 23:26:38 -0400
Subject: [PATCH] Only allow string paths when loading assets

---
 src/play_clj/core_basics.clj   |  6 ++----
 src/play_clj/core_graphics.clj |  7 ++-----
 src/play_clj/g2d.clj           | 18 ++++++------------
 src/play_clj/ui.clj            |  6 ++----
 4 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/src/play_clj/core_basics.clj b/src/play_clj/core_basics.clj
index 135a994..167a94b 100644
--- a/src/play_clj/core_basics.clj
+++ b/src/play_clj/core_basics.clj
@@ -148,11 +148,9 @@
     (.removeProcessor multi p)))
 
 (defn sound*
-  [path]
+  [^String path]
   (or (u/load-asset path Sound)
-      (audio! :new-sound (if (string? path)
-                           (files! :internal path)
-                           path))))
+      (audio! :new-sound (files! :internal path))))
 
 (defmacro sound
   "Returns a [Sound](http://libgdx.badlogicgames.com/nightlies/docs/api/com/badlogic/gdx/audio/Sound.html).
diff --git a/src/play_clj/core_graphics.clj b/src/play_clj/core_graphics.clj
index 7c3f99a..3160994 100644
--- a/src/play_clj/core_graphics.clj
+++ b/src/play_clj/core_graphics.clj
@@ -2,11 +2,8 @@
 
 (defn pixmap*
   [path]
-  (let [^FileHandle fh (if (string? path)
-                         (files! :internal path)
-                         path)]
-    (or (u/load-asset (.path fh) Pixmap)
-        (Pixmap. fh))))
+  (or (u/load-asset path Pixmap)
+      (Pixmap. (files! :internal path))))
 
 (defmacro pixmap
   "Returns a [Pixmap](http://libgdx.badlogicgames.com/nightlies/docs/api/com/badlogic/gdx/graphics/Pixmap.html).
diff --git a/src/play_clj/g2d.clj b/src/play_clj/g2d.clj
index 1d6ae2a..9372b26 100644
--- a/src/play_clj/g2d.clj
+++ b/src/play_clj/g2d.clj
@@ -10,13 +10,11 @@
             ParticleEffectEntity]))
 
 (defn bitmap-font*
-  [path]
+  [^String path]
   (if (nil? path)
     (BitmapFont.)
     (or (u/load-asset path BitmapFont)
-        (BitmapFont. (if (string? path)
-                       (.internal (Gdx/files) path)
-                       path)))))
+        (BitmapFont. (.internal (Gdx/files) path)))))
 
 (defmacro bitmap-font
   "Returns a [BitmapFont](http://libgdx.badlogicgames.com/nightlies/docs/api/com/badlogic/gdx/graphics/g2d/BitmapFont.html).
@@ -128,17 +126,13 @@
 ; particle-effect
 
 (defn particle-effect*
-  [path]
+  [^String path]
   (ParticleEffectEntity.
     (if (nil? path)
       (ParticleEffect.)
-      (let [^Files files (Gdx/files)
-            ^FileHandle fh (if (string? path)
-                             (.internal files path)
-                             path)]
-        (or (u/load-asset (.path fh) ParticleEffect)
-            (doto (ParticleEffect.)
-              (.load fh (.parent fh))))))))
+      (or (u/load-asset path ParticleEffect)
+          (let [^FileHandle fh (.internal (Gdx/files) path)]
+            (doto (ParticleEffect.) (.load fh (.parent fh))))))))
 
 (defmacro particle-effect
   "Returns an entity based on [ParticleEffect](http://libgdx.badlogicgames.com/nightlies/docs/api/com/badlogic/gdx/graphics/g2d/ParticleEffect.html).
diff --git a/src/play_clj/ui.clj b/src/play_clj/ui.clj
index 592c990..e0ed460 100644
--- a/src/play_clj/ui.clj
+++ b/src/play_clj/ui.clj
@@ -36,11 +36,9 @@
      ~@options))
 
 (defn skin*
-  [path]
+  [^String path]
   (or (u/load-asset path Skin)
-      (Skin. (if (string? path)
-               (.internal ^Files (Gdx/files) path)
-               path))))
+      (Skin. (.internal ^Files (Gdx/files) path))))
 
 (defmacro skin
   "Returns a [Skin](http://libgdx.badlogicgames.com/nightlies/docs/api/com/badlogic/gdx/scenes/scene2d/ui/Skin.html)