Asset changes

vittorioromeo · Sep 22, 2013 · 372d2c1 · 372d2c1
1 parent fa5e77d
commit 372d2c1
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 25 deletions.
diff --git a/_RELEASE/Data/Tilesets/tilesetEnemy.json b/_RELEASE/Data/Tilesets/tilesetEnemy.json
diff --git a/_RELEASE/Data/Tilesets/tilesetPlayer.json b/_RELEASE/Data/Tilesets/tilesetPlayer.json
diff --git a/_RELEASE/Data/Tilesets/tsCharSmall.json b/_RELEASE/Data/Tilesets/tsCharSmall.json
@@ -0,0 +1,12 @@
+{
+	"tileSize": [10, 10],
+
+	"labels": 
+	[
+		["p1", "p1f", "p1g"],
+		["p2", "p2f", "p2g"],
+		["p3", "p3f", "p3g"],
+		["p4", "p4f", "p4g"],
+		["e1"]
+	]
+}
diff --git a/_RELEASE/Data/assets.json b/_RELEASE/Data/assets.json
@@ -3,13 +3,12 @@
 	[
 		"tempHud.png",
 		"limeStroked.png",
-		"tileset.png",
-		"tilesetPlayer.png",
-		"tilesetProjectiles.png",
-		"tilesetEnemy.png",
+		"tileset.png",		
+		"tilesetProjectiles.png",		
 		"tilesetEnemyBig.png",
 		"tilesetJuggernaut.png",
-		"tilesetGiant.png"
+		"tilesetGiant.png",
+		"tsCharSmall.png"
 	],
 	"soundBuffers":
 	[	

diff --git a/_RELEASE/Data/tilesetEnemy.png b/_RELEASE/Data/tilesetEnemy.png
diff --git a/_RELEASE/Data/tilesetPlayer.png b/_RELEASE/Data/tilesetPlayer.png
diff --git a/_RELEASE/Data/tsCharSmall.png b/_RELEASE/Data/tsCharSmall.png
diff --git a/include/SSVBloodshed/OBAssets.h b/include/SSVBloodshed/OBAssets.h
@@ -20,18 +20,16 @@ namespace ob
 			ssvs::MusicPlayer musicPlayer;
 
 			ssvs::Tileset& tileset;
-			ssvs::Tileset& tilesetPlayer;
+			ssvs::Tileset& tsCharSmall;
 			ssvs::Tileset& tilesetProjectiles;
-			ssvs::Tileset& tilesetEnemy;
 			ssvs::Tileset& tilesetEnemyBig;
 			ssvs::Tileset& tilesetJuggernaut;
 			ssvs::Tileset& tilesetGiant;
 
 			inline OBAssets() :
 				tileset(assetManager.load<ssvs::Tileset>("ts", "Data/Tilesets/tileset.json")),
-				tilesetPlayer(assetManager.load<ssvs::Tileset>("tsPlayer", "Data/Tilesets/tilesetPlayer.json")),
+				tsCharSmall(assetManager.load<ssvs::Tileset>("ts", "Data/Tilesets/tsCharSmall.json")),
 				tilesetProjectiles(assetManager.load<ssvs::Tileset>("tsProjectiles", "Data/Tilesets/tilesetProjectiles.json")),
-				tilesetEnemy(assetManager.load<ssvs::Tileset>("tsEnemy", "Data/Tilesets/tilesetEnemy.json")),
 				tilesetEnemyBig(assetManager.load<ssvs::Tileset>("tsEnemyBig", "Data/Tilesets/tilesetEnemyBig.json")),
 				tilesetJuggernaut(assetManager.load<ssvs::Tileset>("tsJuggernaut", "Data/Tilesets/tilesetJuggernaut.json")),
 				tilesetGiant(assetManager.load<ssvs::Tileset>("tsGiant", "Data/Tilesets/tilesetGiant.json"))