new objects

13 files changed, 20 insertions, 0 deletions

diff --git a/data/imgs/objects/cantine_glass.png b/data/imgs/objects/cantine_glass.png
new file mode 100644
index 0000000..ba9d830
--- /dev/null
+++ b/data/imgs/objects/cantine_glass.png
diff --git a/data/imgs/objects/glass_door_h_closed.png b/data/imgs/objects/glass_door_h_closed.png
new file mode 100644
index 0000000..938ea76
--- /dev/null
+++ b/data/imgs/objects/glass_door_h_closed.png
diff --git a/data/imgs/objects/glass_door_h_open.png b/data/imgs/objects/glass_door_h_open.png
new file mode 100644
index 0000000..c956786
--- /dev/null
+++ b/data/imgs/objects/glass_door_h_open.png
diff --git a/data/imgs/objects/metal_table_h.png b/data/imgs/objects/metal_table_h.png
new file mode 100644
index 0000000..393a1ce
--- /dev/null
+++ b/data/imgs/objects/metal_table_h.png
diff --git a/data/maps/map1.dat b/data/maps/map1.dat
index f0db3c0..f6cad45 100644
--- a/data/maps/map1.dat
+++ b/data/maps/map1.dat
diff --git a/data/psd/cantine_glass.psd b/data/psd/cantine_glass.psd
new file mode 100644
index 0000000..db670b8
--- /dev/null
+++ b/data/psd/cantine_glass.psd
diff --git a/data/psd/glass_door_h_closed.psd b/data/psd/glass_door_h_closed.psd
new file mode 100644
index 0000000..13fa5dc
--- /dev/null
+++ b/data/psd/glass_door_h_closed.psd
diff --git a/data/psd/glass_door_h_open.psd b/data/psd/glass_door_h_open.psd
new file mode 100644
index 0000000..1e48b98
--- /dev/null
+++ b/data/psd/glass_door_h_open.psd
diff --git a/data/psd/metal_table_h.psd b/data/psd/metal_table_h.psd
new file mode 100644
index 0000000..de25c6d
--- /dev/null
+++ b/data/psd/metal_table_h.psd
diff --git a/include/asset_defs.h b/include/asset_defs.h
index fa04472..7681f2b 100644
--- a/include/asset_defs.h
+++ b/include/asset_defs.h
@@ -45,6 +45,10 @@ image* img_metal_wall2;
 image* img_chair_up;
 image* img_zombie_spawner;
 image* img_lamp_east;
+image* img_metal_table_h;
+image* img_cantine_glass;
+image* img_glass_door_h_closed;
+image* img_glass_door_h_open;
 
 // Throwables
 image* img_grenade;
diff --git a/include/objects.h b/include/objects.h
index 6369224..d1adf34 100644
--- a/include/objects.h
+++ b/include/objects.h
@@ -30,6 +30,9 @@ typedef enum t_object_type {
 	OBJECT_SPACE_WINDOW_H = 7,
 	OBJECT_ZOMBIE_SPAWNER = 8, // Substitute.
 	OBJECT_LAMP_EAST = 9,
+	OBJECT_METAL_TABLE_H = 10,
+	OBJECT_CANTINE_GLASS = 11,
+	OBJECT_GLASS_DOOR_H,
 
 	OBJECT_END,
 } object_type;
@@ -74,6 +77,9 @@ object object_dict[OBJECT_END] = {
 	{0,(vec3f){0, 0, 0},{1,1,1},OBJECT_SPACE_WINDOW_H, 1},
 	{0,(vec3f){0, 0, 0},{1,1,0.5},OBJECT_ZOMBIE_SPAWNER, 1},
 	{0,(vec3f){0, 0, 0},{1,1,0},OBJECT_LAMP_EAST, 0},
+	{0,(vec3f){0, 0, 0},{3,1,0.5},OBJECT_METAL_TABLE_H, 1},
+	{0,(vec3f){0, 0, 0},{2,2,0.5},OBJECT_CANTINE_GLASS, 1},
+	{0,(vec3f){0, 0, 0},{2,1,1},OBJECT_GLASS_DOOR_H, 0},
 };
 
 object get_object_at_tile(float x, float y);
diff --git a/src/asset_defs.c b/src/asset_defs.c
index 14fb149..969f1c8 100644
--- a/src/asset_defs.c
+++ b/src/asset_defs.c
@@ -53,6 +53,10 @@ void load_assets() {
 	img_chair_up = assets_load_image_from_file("data/imgs/objects/chair_up.png");
 	img_zombie_spawner = assets_load_image_from_file("data/imgs/objects/zombie_spawner.png");
 	img_lamp_east = assets_load_image_from_file("data/imgs/objects/lamp_east.png");
+	img_metal_table_h = assets_load_image_from_file("data/imgs/objects/metal_table_h.png");
+	img_cantine_glass = assets_load_image_from_file("data/imgs/objects/cantine_glass.png");
+	img_glass_door_h_open = assets_load_image_from_file("data/imgs/objects/glass_door_h_open.png");
+	img_glass_door_h_closed = assets_load_image_from_file("data/imgs/objects/glass_door_h_closed.png");
 
 	// Players
 	img_gunner_black_run = assets_load_image_from_file("data/imgs/players/Black/Gunner_Black_Run.png");
diff --git a/src/objects.c b/src/objects.c
index eed8e8b..c1caad7 100644
--- a/src/objects.c
+++ b/src/objects.c
@@ -114,6 +114,12 @@ image* get_image_from_objecttype(object_type tile) {
 		return img_zombie_spawner;
 	case OBJECT_LAMP_EAST:
 		return img_lamp_east;
+	case OBJECT_METAL_TABLE_H:
+		return img_metal_table_h;
+	case OBJECT_CANTINE_GLASS:
+		return img_cantine_glass;
+	case OBJECT_GLASS_DOOR_H:
+		return img_glass_door_h_closed;
 	default:
 		return 0;
 	}