Add killing enemies.

1 files changed, 25 insertions, 2 deletions

diff --git a/bullet.c b/bullet.c
index a2f1c66..b3182ea 100644
--- a/bullet.c
+++ b/bullet.c
@@ -3,6 +3,7 @@
 #include "error.h"
 #include "platform.h"
 #include "sprite.h"
+#include "standard.h"
 #include "world.h"
 
 Entity new_player_bullet(
@@ -17,6 +18,7 @@ Entity new_player_bullet(
 	CBullet* bullet;
 	CPosition* pos;
 	CSprite* sprite;
+	CCollider* col;
 	Sprite_ID sprid;
 
 	e = new_entity(world);
@@ -27,11 +29,13 @@ Entity new_player_bullet(
 		ctype_sprite        |
 		ctype_position      |
 		ctype_bullet        |
-		ctype_player_bullet
+		ctype_player_bullet |
+		ctype_collider
 	);
 	pos = &world->positions[e];
 	sprite = &world->sprites[e];
 	bullet = &world->bullets[e];
+	col = &world->colliders[e];
 	pos->x = x;
 	pos->y = y;
 
@@ -39,14 +43,25 @@ Entity new_player_bullet(
 	bullet->vy = vy;
 	bullet->life = life;
 
+	col->x = 0;
+	col->y = 0;
+
 	if (vx < 0) {
 		sprid = sprite_player_bullet_left;
+		col->w = 9  << fbits;
+		col->h = 14 << fbits;
 	} else if (vx > 0) {
 		sprid = sprite_player_bullet_right;
+		col->w = 9  << fbits;
+		col->h = 14 << fbits;
 	} else if (vy < 0) {
 		sprid = sprite_player_bullet_up;
+		col->w = 9  << fbits;
+		col->h = 14 << fbits;
 	} else if (vy > 0) {
 		sprid = sprite_player_bullet_down;
+		col->w = 9  << fbits;
+		col->h = 14 << fbits;
 	}
 #ifdef DEBUG
 	else {
@@ -71,6 +86,7 @@ int new_enemy_bullet(
 	CBullet* bullet;
 	CPosition* pos;
 	CSprite* sprite;
+	CCollider* col;
 
 	e = new_entity(world);
 
@@ -80,11 +96,13 @@ int new_enemy_bullet(
 		ctype_sprite        |
 		ctype_position      |
 		ctype_bullet        |
-		ctype_enemy_bullet
+		ctype_enemy_bullet  |
+		ctype_collider
 	);
 	pos = &world->positions[e];
 	sprite = &world->sprites[e];
 	bullet = &world->bullets[e];
+	col = &world->colliders[e];
 	pos->x = x;
 	pos->y = y;
 
@@ -92,6 +110,11 @@ int new_enemy_bullet(
 	bullet->vy = vy;
 	bullet->life = 500;
 
+	col->x = 1 << fbits;
+	col->y = 1 << fbits;
+	col->w = 3 << fbits;
+	col->h = 3 << fbits;
+
 	init_csprite(sprite, sprite_enemy_bullet);
 
 	return e;