Use same tileset directory for both development & distribution...

...package for simplicity
arianne · Mar 29, 2024 · e9d88dc · e9d88dc
1 parent 66f5f93
commit e9d88dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 20 deletions.
diff --git a/buildtools/ant_modules/dist.xml b/buildtools/ant_modules/dist.xml
@@ -117,7 +117,7 @@
 				<exclude name="items/meta/"/>
 			</fileset>
 		</copy>
-		<copy todir="${build_client_data}/data/tileset">
+		<copy todir="${build_client_data}/data/maps/tileset">
 			<fileset dir="${maps}/tileset">
 				<exclude name="**/*.bz2"/>
 				<exclude name="**/*.gz"/>

diff --git a/src/games/stendhal/client/TileStore.java b/src/games/stendhal/client/TileStore.java
@@ -56,7 +56,7 @@ class TileStore implements Tileset {
 	/**
 	 * The base directory for tileset resources.
 	 */
-	private static final String baseFolder = getResourceBase();
+	private static final String baseFolder = "data/maps/";
 
 	/**
 	 * The tileset animation map.
@@ -436,24 +436,6 @@ private static TilesetGroupAnimationMap createAnimationMap(final String id,
 		return map;
 	}
 
-	/**
-	 * Get the base directory for tileset resources.
-	 *
-	 * Hack: Read the tileset directly from tiled/tileset if started from an
-	 * IDE.
-	 * @return the / separated url to the resource
-	 */
-	private static String getResourceBase() {
-		String path = "data/";
-
-		if (DataLoader.getResource("data/maps/tileset/README") != null) {
-			logger.debug("Developing mode, loading tileset from data/maps/tileset instead of data/tileset");
-			path = "data/maps/";
-		}
-
-		return path;
-	}
-
 	//
 	// Tileset
 	//