painting and new tiles

3 files changed, 41 insertions, 6 deletions

diff --git a/src/asset_defs.c b/src/asset_defs.c
index 5e8b440..45a248f 100644
--- a/src/asset_defs.c
+++ b/src/asset_defs.c
@@ -93,6 +93,17 @@ void load_assets() { // Assets loaded at match start.
 	img_club_seat7 = assets_load_image_from_file("data/imgs/objects/club_seat7.png");
 	img_bowling_lane = assets_load_image_from_file("data/imgs/objects/bowling_lane.png");
 	img_bowling_lane_end = assets_load_image_from_file("data/imgs/objects/bowling_lane_end.png");
+	img_bowling_machine = assets_load_image_from_file("data/imgs/objects/bowling_machine.png");
+	img_painting1 = assets_load_image_from_file("data/imgs/objects/painting1.png");
+	img_painting2 = assets_load_image_from_file("data/imgs/objects/painting2.png");
+	img_painting3 = assets_load_image_from_file("data/imgs/objects/painting3.png");
+	img_painting4 = assets_load_image_from_file("data/imgs/objects/painting4.png");
+	img_painting5 = assets_load_image_from_file("data/imgs/objects/painting5.png");
+	img_painting6 = assets_load_image_from_file("data/imgs/objects/painting6.png");
+	img_painting7 = assets_load_image_from_file("data/imgs/objects/painting7.png");
+	img_painting8 = assets_load_image_from_file("data/imgs/objects/painting8.png");
+	img_painting9 = assets_load_image_from_file("data/imgs/objects/painting9.png");
+	img_painting10 = assets_load_image_from_file("data/imgs/objects/painting10.png");
 
 	// Players
 	img_gunner_black_run = assets_load_image_from_file("data/imgs/players/Black/Gunner_Black_Run.png");
@@ -160,6 +171,8 @@ void load_assets() { // Assets loaded at match start.
 	img_tile_club_stairs11 = assets_load_image_from_file("data/imgs/tiles/club_stairs11.png");
 	img_tile_club_stairs12 = assets_load_image_from_file("data/imgs/tiles/club_stairs12.png");
 	img_tile_club_stairs13 = assets_load_image_from_file("data/imgs/tiles/club_stairs13.png");
+	img_tile_concrete = assets_load_image_from_file("data/imgs/tiles/tile_concrete.png");
+	img_tile_laminate = assets_load_image_from_file("data/imgs/tiles/tile_laminate.png");
 
 	// sounds
 	wav_throwable_bounce = Mix_LoadWAV("data/sounds/throwable_bounce.wav");
diff --git a/src/map.c b/src/map.c
index 9e0e7cd..d05f8a4 100644
--- a/src/map.c
+++ b/src/map.c
@@ -275,18 +275,15 @@ void load_mapdata_into_world() {
 
 		if (o.type == OBJECT_ZOMBIE_SPAWNER) {
 			create_spawner((vec2){.x = o.position.x, .y = o.position.y});
-			loaded_map.objects[i].active = 0;
 		}
 
 		if (o.type == OBJECT_GLASS_DOOR_H || o.type == OBJECT_GLASS_DOOR_V) {
 			create_glass_door(o);
-			loaded_map.objects[i].active = 0;
 		}
 
 		if (o.type == OBJECT_BOWLING_LANE)
 		{
 			add_decoration_object(o);
-			loaded_map.objects[i].active = 0;
 		}
 	}
 }
@@ -424,6 +421,8 @@ image* get_image_from_tiletype(tile_type tile) {
 		case TILE_CLUB_STAIRS11: return img_tile_club_stairs11;
 		case TILE_CLUB_STAIRS12: return img_tile_club_stairs12;
 		case TILE_CLUB_STAIRS13: return img_tile_club_stairs13;
+		case TILE_LAMINATE: return img_tile_laminate;
+		case TILE_CONCRETE: return img_tile_concrete;
 		default: return 0;
 	}
 }
diff --git a/src/objects.c b/src/objects.c
index 9342eb0..2574ed7 100644
--- a/src/objects.c
+++ b/src/objects.c
@@ -169,6 +169,28 @@ image* get_image_from_objecttype(object_type tile) {
 		return img_bowling_lane_end;
 	case OBJECT_GLASS_DOOR_V:
 		return img_glass_door_v_closed;
+	case OBJECT_BOWLING_MACHINE:
+		return img_bowling_machine;
+	case OBJECT_PAINTING1:
+		return img_painting1;
+	case OBJECT_PAINTING2:
+		return img_painting2;
+	case OBJECT_PAINTING3:
+		return img_painting3;
+	case OBJECT_PAINTING4:
+		return img_painting4;
+	case OBJECT_PAINTING5:
+		return img_painting5;
+	case OBJECT_PAINTING6:
+		return img_painting6;
+	case OBJECT_PAINTING7:
+		return img_painting7;
+	case OBJECT_PAINTING8:
+		return img_painting8;
+	case OBJECT_PAINTING9:
+		return img_painting9;
+	case OBJECT_PAINTING10:
+		return img_painting10;
 	default:
 		return 0;
 	}
@@ -180,6 +202,7 @@ void add_decoration_object(object o)
 	{
 		if (decoration_objects[i].active) continue;
 		decoration_objects[i] = o;
+		return;
 	}
 }
 
@@ -203,9 +226,9 @@ void draw_objects(platform_window* window) {
 		if (!loaded_map.objects[i].active) continue;
 		object o = loaded_map.objects[i];
 
-		//if (o.type == OBJECT_GLASS_DOOR_H) continue;
-		//if (o.type == OBJECT_GLASS_DOOR_V) continue;
-		//if (o.type == OBJECT_BOWLING_LANE) continue;
+		if (o.type == OBJECT_GLASS_DOOR_H) continue;
+		if (o.type == OBJECT_GLASS_DOOR_V) continue;
+		if (o.type == OBJECT_BOWLING_LANE) continue;
 		
 		box box = get_box_of_object(window, o);