From f4fdb094810d6f24de570e77f073cff2022f772c Mon Sep 17 00:00:00 2001 From: Jason Long Date: Mon, 16 Jun 2014 20:38:30 -0400 Subject: [PATCH] graphics: change where images are loaded from when running the gui tiles.png used to be at the root of the jar, now it is in the '16x16' subdirectory (or '32x32' or '8x8' or 'sm' depending on what resolution is being loaded) --- src/micropolisj/gui/OverlayMapView.java | 2 +- src/micropolisj/gui/TileImages.java | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/micropolisj/gui/OverlayMapView.java b/src/micropolisj/gui/OverlayMapView.java index 9b300d7..2d38ecd 100644 --- a/src/micropolisj/gui/OverlayMapView.java +++ b/src/micropolisj/gui/OverlayMapView.java @@ -94,7 +94,7 @@ public class OverlayMapView extends JComponent repaint(); } - static BufferedImage tileArrayImage = loadImage("/tilessm.png"); + static BufferedImage tileArrayImage = loadImage("/sm/tiles.png"); static final int TILE_WIDTH = 3; static final int TILE_HEIGHT = 3; static final int TILE_OFFSET_Y = 3; diff --git a/src/micropolisj/gui/TileImages.java b/src/micropolisj/gui/TileImages.java index 6a3f8cc..c0180cd 100644 --- a/src/micropolisj/gui/TileImages.java +++ b/src/micropolisj/gui/TileImages.java @@ -29,13 +29,7 @@ public class TileImages this.TILE_WIDTH = size; this.TILE_HEIGHT = size; - if (size != 16) { - this.images = loadTileImages("/tiles_"+size+"x"+size+".png", size); - } - else { - this.images = loadTileImages("/tiles.png", 16); - } - + this.images = loadTileImages("/"+size+"x"+size+"/tiles.png", size); loadSpriteImages(); }