Make image loading errors no longer crash.

rpgboss · Dec 31, 2015 · 5aa3da1 · 5aa3da1
1 parent 5bbdd20
commit 5aa3da1
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/core/src/main/scala/rpgboss/model/resource/ImageResource.scala b/core/src/main/scala/rpgboss/model/resource/ImageResource.scala
@@ -87,9 +87,20 @@ trait TiledImageResource[T, MT <: AnyRef] extends ImageResource[T, MT] {
 trait ImageResource[T, MT <: AnyRef]
   extends Resource[T, MT]
   with RpgGdxAsset[Texture] {
-  // TODO: Refactor or eliminate this method, since it's unpredictable
-  lazy val img = Option(ImageIO.read(newDataStream)) getOrElse {
-    throw ResourceException("Can't load image: %s".format(name))
+
+  /**
+   * Always returns a non-null BufferedImage. Returns a placeholder image on
+   * error.
+   */
+  lazy val img: BufferedImage = {
+    val stream = newDataStream
+    if (stream == null) {
+      ImageResource.errorTile
+    } else {
+      Option(ImageIO.read(stream)) getOrElse {
+        ImageResource.errorTile
+      }
+    }
   }
 }