walls, msvc building

1 files changed, 11 insertions, 49 deletions

diff --git a/include/objects.h b/include/objects.h
index 9d22942..cb42a04 100644
--- a/include/objects.h
+++ b/include/objects.h
@@ -69,6 +69,16 @@ typedef enum t_object_type {
 	OBJECT_PAINTING8 = 45,
 	OBJECT_PAINTING9 = 46,
 	OBJECT_PAINTING10 = 47,
+	OBJECT_FLOORMAT1 = 48,
+	OBJECT_FLOORMAT2 = 49,
+	OBJECT_METAL_WALL3 = 50,
+	OBJECT_METAL_WALL4 = 51,
+	OBJECT_METAL_WALL5 = 52,
+	OBJECT_METAL_WALL6 = 53,
+	OBJECT_METAL_WALL7 = 54,
+	OBJECT_METAL_WALL8 = 55,
+	OBJECT_METAL_WALL9 = 56,
+	OBJECT_METAL_WALL10 = 57,
 
 	OBJECT_END,
 } object_type;
@@ -103,55 +113,7 @@ typedef struct t_box {
 } box;
 
 // @NEWOBJECT
-object object_dict[OBJECT_END] = {
-	{0,(vec3f){0, 0, 0},{1,3,0.5f},OBJECT_SPACE_CONTROL_PANEL, 1},
-	{0,(vec3f){0, 0, 0},{1,1,1},OBJECT_SPACE_WINDOW, 1},
-	{0,(vec3f){0, 0, 0},{1,1,1},OBJECT_METAL_WALL, 1},
-	{0,(vec3f){0, 0, 0},{1,1,1},OBJECT_METAL_WALL2, 1},
-	{0,(vec3f){0, 0, 0},{3,1,0.5f},OBJECT_SPACE_CONTROL_PANEL2, 1},
-	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CHAIR_UP, 1},
-	{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},
-	{0,(vec3f){0, 0, 0},{1,1,1},OBJECT_LAMP_SOUTH, 0},
-	{0,(vec3f){0, 0, 0},{3,7,0.5f},OBJECT_BIG_CONTROL_PANEL, 1},
-	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CHAIR_DOWN, 1},
-	{0,(vec3f){0, 0, 0},{2,1,1.0f},OBJECT_COMPUTER_RACK, 1},
-	{0,(vec3f){0, 0, 0},{8,2,1.0f},OBJECT_GENERATOR, 1},
-	{0,(vec3f){0, 0, 0},{1,4,0.5f},OBJECT_SCHOOL_TABLE, 1},
-	{0,(vec3f){0, 0, 0},{2,1,0.5f},OBJECT_SCHOOL_BENCH, 1},
-	{0,(vec3f){0, 0, 0},{1,1,1.0f},OBJECT_LOCKER, 1},
-	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_BAR_H, 1},
-	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_BAR_V, 1},
-	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_BAR_HV, 1},
-	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_SEAT1, 1},
-	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_SEAT2, 1},
-	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_SEAT3, 1},
-	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_SEAT4, 1},
-	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_WALL1, 1},
-	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_WALL2, 1},
-	{0,(vec3f){0, 0, 0},{1,1,1.0f},OBJECT_CLUB_WALL3, 1},
-	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_SEAT5, 1},
-	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_SEAT6, 1},
-	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_SEAT7, 1},
-	{0,(vec3f){0, 0, 0},{13,3,0},OBJECT_BOWLING_LANE, 0},
-	{0,(vec3f){0, 0, 0},{2,3,1},OBJECT_BOWLING_LANE_END, 1},
-	{0,(vec3f){0, 0, 0},{1,2,1},OBJECT_GLASS_DOOR_V, 0},
-	{0,(vec3f){0, 0, 0},{3,1,0.5f},OBJECT_BOWLING_MACHINE, 1},
-	{0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING1, 0},
-	{0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING2, 0},
-	{0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING3, 0},
-	{0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING4, 0},
-	{0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING5, 0},
-	{0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING6, 0},
-	{0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING7, 0},
-	{0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING8, 0},
-	{0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING9, 0},
-	{0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING10, 0},
-};
+object object_dict[OBJECT_END];
 
 // decoration objects laying on floor.
 object decoration_objects[MAX_DECORATION_OBJECTS] = {0};