generator

9 files changed, 10 insertions, 1 deletions

diff --git a/data/imgs/objects/generator.png b/data/imgs/objects/generator.png
new file mode 100644
index 0000000..d87d4b3
--- /dev/null
+++ b/data/imgs/objects/generator.png
diff --git a/data/maps/map1.dat b/data/maps/map1.dat
index 811e5f1..737210d 100644
--- a/data/maps/map1.dat
+++ b/data/maps/map1.dat
diff --git a/data/psd/generator.psd b/data/psd/generator.psd
new file mode 100644
index 0000000..47ccaa7
--- /dev/null
+++ b/data/psd/generator.psd
diff --git a/include/asset_defs.h b/include/asset_defs.h
index f76a2bc..0e7e5b4 100644
--- a/include/asset_defs.h
+++ b/include/asset_defs.h
@@ -53,6 +53,7 @@ image* img_glass_door_h_open;
 image* img_big_control_panel;
 image* img_chair_down;
 image* img_computer_rack;
+image* img_generator;
 
 // Throwables
 image* img_grenade;
diff --git a/include/objects.h b/include/objects.h
index 6cfbf43..dd9760b 100644
--- a/include/objects.h
+++ b/include/objects.h
@@ -37,6 +37,7 @@ typedef enum t_object_type {
 	OBJECT_BIG_CONTROL_PANEL = 14,
 	OBJECT_CHAIR_DOWN = 15,
 	OBJECT_COMPUTER_RACK = 16,
+	OBJECT_GENERATOR = 17,
 
 	OBJECT_END,
 } object_type;
@@ -88,6 +89,7 @@ object object_dict[OBJECT_END] = {
 	{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},
 };
 
 object get_object_at_tile(float x, float y);
diff --git a/src/asset_defs.c b/src/asset_defs.c
index 406fc69..390bf94 100644
--- a/src/asset_defs.c
+++ b/src/asset_defs.c
@@ -61,6 +61,7 @@ void load_assets() {
 	img_glass_door_h_closed = assets_load_image_from_file("data/imgs/objects/glass_door_h_closed.png");
 	img_big_control_panel = assets_load_image_from_file("data/imgs/objects/big_control_panel.png");
 	img_computer_rack = assets_load_image_from_file("data/imgs/objects/computer_rack.png");
+	img_generator = assets_load_image_from_file("data/imgs/objects/generator.png");
 
 	// Players
 	img_gunner_black_run = assets_load_image_from_file("data/imgs/players/Black/Gunner_Black_Run.png");
diff --git a/src/bullets.c b/src/bullets.c
index df06f90..7517949 100644
--- a/src/bullets.c
+++ b/src/bullets.c
@@ -60,8 +60,11 @@ void shoot(platform_window* window, u32 id, float dirx, float diry) {
 		add_audio_event_to_queue(EVENT_RELOAD, p->id, (vec3f){.x = p->playerx, .y = p->playery, .z = p->height});
 		p->interact_state = INTERACT_RELOADING;
 		p->sec_since_interact_state_change = 0;
+		//printf("XD!\n");
 		return;
 	}
+	//p->interact_state = INTERACT_RELOADING;
+	//p->sec_since_interact_state_change = 0;
 }
 
 bool check_if_bullet_collided_with_section(float* dist_of_closest_intersect, vec2f bstart, vec2f bend, vec2f l1, vec2f l2, vec2f* intersect_point_buf) {
diff --git a/src/objects.c b/src/objects.c
index fd2d811..db0295d 100644
--- a/src/objects.c
+++ b/src/objects.c
@@ -129,6 +129,8 @@ image* get_image_from_objecttype(object_type tile) {
 		return img_chair_down;
 	case OBJECT_COMPUTER_RACK:
 		return img_computer_rack;
+	case OBJECT_GENERATOR:
+		return img_generator;
 	default:
 		return 0;
 	}
diff --git a/src/players.c b/src/players.c
index dd62611..b5d0666 100644
--- a/src/players.c
+++ b/src/players.c
@@ -430,7 +430,7 @@ void update_players_server() {
 static void draw_player_bullet_cone(platform_window* window, player* p) {
 	map_info info = get_map_info(window);
 	float bullet_range = 100.0f;
-	int divisions = 10;
+	int divisions = 3;
 
 	float bulletx = p->gunx;
 	float bullety = p->guny;