summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNao Pross <naopross@thearcway.org>2018-11-20 21:46:38 +0100
committerNao Pross <naopross@thearcway.org>2018-11-20 21:46:38 +0100
commite9bc7ab199fdda3859a224eb3c8cfea2685514bd (patch)
treec66e34d3722182ffad293e1422bfc5d36ccac3a7
parentRefractor MapScene.render() AffineTransforms (diff)
downloadSubconscious-java-e9bc7ab199fdda3859a224eb3c8cfea2685514bd.tar.gz
Subconscious-java-e9bc7ab199fdda3859a224eb3c8cfea2685514bd.zip
Add res folder for resources
-rw-r--r--res/maps/testmap.json (renamed from testmap.json)0
-rw-r--r--src/subconscious/Game.java2
2 files changed, 1 insertions, 1 deletions
diff --git a/testmap.json b/res/maps/testmap.json
index 1bfb65e..1bfb65e 100644
--- a/testmap.json
+++ b/res/maps/testmap.json
diff --git a/src/subconscious/Game.java b/src/subconscious/Game.java
index 7828105..8e51a32 100644
--- a/src/subconscious/Game.java
+++ b/src/subconscious/Game.java
@@ -42,7 +42,7 @@ public class Game {
// TODO: this will be replaced with a dynamic mechanism based
// on the progress within the game
- Map testMap = this.mapLoader.parse("../testmap.json");
+ Map testMap = this.mapLoader.parse("../res/maps/testmap.json");
this.currentMap = testMap;
this.maps.add(testMap);