new tiles

21 files changed, 26 insertions, 2 deletions

diff --git a/data/imgs/tiles/tile_carpet1.png b/data/imgs/tiles/tile_carpet1.png
new file mode 100644
index 0000000..f3df61f
--- /dev/null
+++ b/data/imgs/tiles/tile_carpet1.png
diff --git a/data/imgs/tiles/tile_carpet2.png b/data/imgs/tiles/tile_carpet2.png
new file mode 100644
index 0000000..8aa2841
--- /dev/null
+++ b/data/imgs/tiles/tile_carpet2.png
diff --git a/data/imgs/tiles/tile_carpet3.png b/data/imgs/tiles/tile_carpet3.png
new file mode 100644
index 0000000..809a1e2
--- /dev/null
+++ b/data/imgs/tiles/tile_carpet3.png
diff --git a/data/imgs/tiles/tile_carpet4.png b/data/imgs/tiles/tile_carpet4.png
new file mode 100644
index 0000000..70d27c9
--- /dev/null
+++ b/data/imgs/tiles/tile_carpet4.png
diff --git a/data/imgs/tiles/tile_carpet5.png b/data/imgs/tiles/tile_carpet5.png
new file mode 100644
index 0000000..3e62368
--- /dev/null
+++ b/data/imgs/tiles/tile_carpet5.png
diff --git a/data/imgs/tiles/tile_flowers.png b/data/imgs/tiles/tile_flowers.png
new file mode 100644
index 0000000..952f33f
--- /dev/null
+++ b/data/imgs/tiles/tile_flowers.png
diff --git a/data/maps/map1.dat b/data/maps/map1.dat
index 112e9c2..fcfd204 100644
--- a/data/maps/map1.dat
+++ b/data/maps/map1.dat
diff --git a/data/psd/tile_carpet1.psd b/data/psd/tile_carpet1.psd
new file mode 100644
index 0000000..3be2942
--- /dev/null
+++ b/data/psd/tile_carpet1.psd
diff --git a/data/psd/tile_carpet2.psd b/data/psd/tile_carpet2.psd
new file mode 100644
index 0000000..88bfac5
--- /dev/null
+++ b/data/psd/tile_carpet2.psd
diff --git a/data/psd/tile_carpet3.psd b/data/psd/tile_carpet3.psd
new file mode 100644
index 0000000..7383d8e
--- /dev/null
+++ b/data/psd/tile_carpet3.psd
diff --git a/data/psd/tile_carpet4.psd b/data/psd/tile_carpet4.psd
new file mode 100644
index 0000000..a6c319a
--- /dev/null
+++ b/data/psd/tile_carpet4.psd
diff --git a/data/psd/tile_carpet5.psd b/data/psd/tile_carpet5.psd
new file mode 100644
index 0000000..0819272
--- /dev/null
+++ b/data/psd/tile_carpet5.psd
diff --git a/data/psd/tile_flowers.psd b/data/psd/tile_flowers.psd
new file mode 100644
index 0000000..5d31580
--- /dev/null
+++ b/data/psd/tile_flowers.psd
diff --git a/data/psd/tile_flowers1.psd b/data/psd/tile_flowers1.psd
new file mode 100644
index 0000000..71fdde8
--- /dev/null
+++ b/data/psd/tile_flowers1.psd
diff --git a/data/psd/tile_flowers2.psd b/data/psd/tile_flowers2.psd
new file mode 100644
index 0000000..781a6c5
--- /dev/null
+++ b/data/psd/tile_flowers2.psd
diff --git a/data/psd/tile_flowers3.psd b/data/psd/tile_flowers3.psd
new file mode 100644
index 0000000..46a88bd
--- /dev/null
+++ b/data/psd/tile_flowers3.psd
diff --git a/data/psd/tile_flowers4.psd b/data/psd/tile_flowers4.psd
new file mode 100644
index 0000000..46a88bd
--- /dev/null
+++ b/data/psd/tile_flowers4.psd
diff --git a/include/asset_defs.h b/include/asset_defs.h
index 455aad7..6bb18e1 100644
--- a/include/asset_defs.h
+++ b/include/asset_defs.h
@@ -109,7 +109,7 @@ image* img_zombie_chunk_hand;
 image* img_zombie_chunk_foot;
 image* img_zombie_chunk_blood;
 
-// Tiles
+// Tiles @NEWTILE
 image* img_mars_surface;
 image* img_space_parallax;
 image* img_tile_floor1;
@@ -118,6 +118,12 @@ image* img_tile_bathroom;
 image* img_tile_funk;
 image* img_tile_wood1;
 image* img_tile_gym;
+image* img_tile_flowers;
+image* img_tile_carpet1;
+image* img_tile_carpet2;
+image* img_tile_carpet3;
+image* img_tile_carpet4;
+image* img_tile_carpet5;
 
 // Sounds
 Mix_Chunk* wav_throwable_bounce;
diff --git a/include/map.h b/include/map.h
index 960e9e6..b3c1512 100644
--- a/include/map.h
+++ b/include/map.h
@@ -15,6 +15,12 @@ typedef enum t_tile_type {
 	TILE_FUNK = 4,
 	TILE_WOOD1 = 5,
 	TILE_GYM = 6,
+	TILE_FLOWERS = 7,
+	TILE_CARPET1 = 8,
+	TILE_CARPET2 = 9,
+	TILE_CARPET3 = 10,
+	TILE_CARPET4 = 11,
+	TILE_CARPET5 = 12,
 
 	TILE_END,
 } tile_type;
diff --git a/src/asset_defs.c b/src/asset_defs.c
index 5d4b2cd..38cddd4 100644
--- a/src/asset_defs.c
+++ b/src/asset_defs.c
@@ -119,6 +119,12 @@ void load_assets() { // Assets loaded at match start.
 	img_tile_funk = assets_load_image_from_file("data/imgs/tiles/tile_funk.png");
 	img_tile_wood1 = assets_load_image_from_file("data/imgs/tiles/tile_wood1.png");
 	img_tile_gym = assets_load_image_from_file("data/imgs/tiles/tile_gym.png");
+	img_tile_flowers = assets_load_image_from_file("data/imgs/tiles/tile_flowers.png");
+	img_tile_carpet1 = assets_load_image_from_file("data/imgs/tiles/tile_carpet1.png");
+	img_tile_carpet2 = assets_load_image_from_file("data/imgs/tiles/tile_carpet2.png");
+	img_tile_carpet3 = assets_load_image_from_file("data/imgs/tiles/tile_carpet3.png");
+	img_tile_carpet4 = assets_load_image_from_file("data/imgs/tiles/tile_carpet4.png");
+	img_tile_carpet5 = assets_load_image_from_file("data/imgs/tiles/tile_carpet5.png");
 
 	// sounds
 	wav_throwable_bounce = Mix_LoadWAV("data/sounds/throwable_bounce.wav");
diff --git a/src/map.c b/src/map.c
index 9d001fd..d2e44d9 100644
--- a/src/map.c
+++ b/src/map.c
@@ -384,7 +384,7 @@ bool is_in_bounds(float x, float y) {
 }
 
 image* get_image_from_tiletype(tile_type tile) {
-	switch (tile)
+	switch (tile) // @NEWTILE
 	{
 		case TILE_FLOOR1: return img_tile_floor1;
 		case TILE_FLOOR2: return img_tile_floor2;
@@ -392,6 +392,12 @@ image* get_image_from_tiletype(tile_type tile) {
 		case TILE_FUNK: return img_tile_funk;
 		case TILE_WOOD1: return img_tile_wood1;
 		case TILE_GYM: return img_tile_gym;
+		case TILE_FLOWERS: return img_tile_flowers;
+		case TILE_CARPET1: return img_tile_carpet1;
+		case TILE_CARPET2: return img_tile_carpet2;
+		case TILE_CARPET3: return img_tile_carpet3;
+		case TILE_CARPET4: return img_tile_carpet4;
+		case TILE_CARPET5: return img_tile_carpet5;
 		default: return 0;
 	}
 }